Merge remote-tracking branch 'origin/main' into CAM_Auto

Profiles/WinConst.lua

@@ -81,10 +81,12 @@ WIN_AREATYPES = {
 -- tipo di split:
 -- mullion = montante
 -- french = battente / ricevente
+-- mixed = cambio profilo
 WIN_SPLITTYPES = {
    NULL = 0,
    MULLION = 1,
    FRENCH = 2,
+   MIXED = 3,
 }
 
 -- tipi di riempimento interno
@@ -105,6 +107,13 @@ WIN_SASHTYPES = {
    INACTIVE_OUT = 6,
 }
 
+WIN_CHILDREN_TYPES = {
+   NULL = 0,
+   SASH = 1,
+   FILL = 2,
+   MIXED = 3,
+}
+
 WIN_SURF_APPROX = 0.05
 
 WIN_PROFILE = 'Profile'
@@ -135,10 +144,8 @@ WIN_AREATYPE = 'AreaType'
 WIN_SASH = 'Sash'
 WIN_FILL = 'Fill'
 WIN_FILLTYPE = 'FillType'
-WIN_SIDE = 'Side'
 WIN_SPLITTYPE = 'SplitType'
 WIN_STARTJOINT = 'StartJoint'
-WIN_ENDJOINT = 'EndJoint'
 WIN_SASHTYPE = 'SashType'
 WIN_REF_OUTLINE = 'OutlineRef'
 WIN_REF_PART = 'PartRef'
@@ -159,6 +166,9 @@ WIN_FRENCH_IN = 'French_In'
 WIN_FRENCH_OUT = 'French_Out'
 WIN_SASH_SPLIT = 'Sash_Split'
 WIN_FRAME_SPLIT = 'Frame_Split'
+WIN_MIXED_BOTTOM = 'Mixed_Bottom'
+WIN_MIXED_TOP = 'Mixed_Top'
+WIN_MIXED_SPLIT = 'Mixed_Split'
 
 WIN_REF = 'Ref'
 WIN_SECTION = 'Section'
@@ -171,11 +181,13 @@ WIN_OUTOFST = 'OfstOut'
 WIN_CTRINOFST = 'OfstCtrIn'
 WIN_OFST = 'Ofst'
 WIN_SECTIONFRAME = 'SectionFrame'
+WIN_MIXED_COMMON = 'Common'
+WIN_SIMPLIFIED = 'Simplified'
 
 WIN_MINIZINKEN = 'MiniZinken'
 
-WIN_STARTCPDELTA = 'StartCPDelta'
-WIN_ENDCPDELTA = 'EndCPDelta'
+-- WIN_STARTCPDELTA = 'StartCPDelta'
+-- WIN_ENDCPDELTA = 'EndCPDelta'
 WIN_GEOWIDTH = 'GeoWidth'
 WIN_GLASSTHICKNESS = 'GlassThickness'
 WIN_SEMI_PROFILE = 'SemiProfileId'
@@ -212,7 +224,8 @@ WIN_SOU = 'SOU'
 WIN_CHILD = 'CHILD'
 WIN_COPY = 'COPY'
 
-WIN_OVERLAP = 'Overlap'
+WIN_SASH_TOP_OVERLAP = 'SashTopOverlap'
+WIN_SASH_BOTTOM_OVERLAP = 'SashBottomOverlap'
 WIN_DELTA = 'Delta'
 WIN_FILLOVERLAP = 'FillOverlap'
 WIN_FILLDELTA = 'FillDelta'
@@ -220,7 +233,9 @@ WIN_GAPDELTA = 'GapDelta'
 WIN_GAPDELTAZ = 'GapDeltaZ'
 WIN_GAPDELTAIN = 'GapDeltaIn'
 WIN_GAPDELTAOUT = 'GapDeltaOut'
-
+WIN_FIXED_REF = 'FixedRef'
+WIN_SASH_REF = 'SashRef'
+WIN_SASH_DEPTH = 'SashDepth'
 WIN_PRC_PHASE = 'PHASE'
 WIN_PRC_PROFILE_TYPE = 'PROFILE_TYPE'
 WIN_PRC_NTOOLS = 'NTOOLS'
@@ -231,12 +246,30 @@ WIN_PRC_OFFY_1 = 'OFFY_1'
 WIN_PRC_OFFZ_1 = 'OFFZ_1'
 WIN_PRC_OFFY_2 = 'OFFY_2'
 WIN_PRC_OFFZ_2 = 'OFFZ_2'
+WIN_PRC_CLAMPV_1 = 'CLAMPV_1'
+WIN_PRC_CLAMPV_2 = 'CLAMPV_2'
+WIN_STRIP_DIST = 'StripDistance'
 
+WIN_REF_SPLIT = 'RefSplit'
 WIN_CRV_ON_FRENCH_SPLIT = 'OutlineOnFrenchSplit'
+WIN_PREV_OUTLINES = 'PrevOutlines'
+WIN_NEXT_OUTLINES = 'NextOutlines'
+
+WIN_PRF_CHANGE = 'ProfileChange'
+WIN_MIXED_OUTLINES = 'ProfileChangeOutlines'
+WIN_MIXED_INTERSECTIONS = 'ProfileChangeIntersections'
+WIN_SASH_CHILDREN = 'SashChildren'
+WIN_FILL_CHILDREN = 'FillChildren'
+WIN_MIXED_SPLIT_REF = 'MixedSplitRef'
+WIN_MIXED_INTERS_REF = 'MixedIntersRef'
+WIN_MIXED_REF_START = 'MixedRefEnd'
+WIN_MIXED_REF_END = 'MixedRefStart'
 
 WIN_MAINGUIDE = 'MainGuide'
 WIN_SRF_MAIN = 'MainSurface'
 WIN_SRF_ORIGMAIN = 'OrigMainSurface'
+WIN_SRF_START = 'StartSurface'
+WIN_SRF_END = 'EndSurface'
 WIN_SRF_STRIP = 'StripSurface'
 
 WIN_BOTTOMRAIL = 'BottomRail'
@@ -248,7 +281,8 @@ WIN_PRC_TYPE = {
    HOLE = 'Hole',
    PROFILING = 'Profiling',
    POCKET = 'Pocket',
-   CUT = 'Cut'
+   CUT = 'Cut',
+   STRIP_CUT = 'StripCut'
 }
 WIN_PRC_OVERMAT_IN = 'OVERMAT_IN'
 WIN_PRC_OVERMAT_OUT = 'OVERMAT_OUT'
@@ -263,32 +297,15 @@ WIN_PRC_DWL_SIDETYPE = {
 }
 
 WIN_DOWEL = 'Dowel'
-WIN_DWL_TOPPERPSTART = 'TopPerpStart'
-WIN_DWL_TOPPERPEND = 'TopPerpEnd'
-WIN_DWL_TOPPARASTART = 'TopParaStart'
-WIN_DWL_TOPPARAEND = 'TopParaEnd'
-WIN_DWL_BOTTOMPERPSTART = 'BottomPerpStart'
-WIN_DWL_BOTTOMPERPEND = 'BottomPerpEnd'
-WIN_DWL_BOTTOMPARASTART = 'BottomParaStart'
-WIN_DWL_BOTTOMPARAEND = 'BottomParaEnd'
-WIN_DWL_RAILBOTTOMPERPSTART = 'RailBottomPerpStart'
-WIN_DWL_RAILBOTTOMPERPEND = 'RailBottomPerpEnd'
-WIN_DWL_RAILBOTTOMPARASTART = 'RailBottomParaStart'
-WIN_DWL_RAILBOTTOMPARAEND = 'RailBottomParaEnd'
-WIN_DWL_SPLITPERPSTART = 'SplitPerpStart'
-WIN_DWL_SPLITPERPEND = 'SplitPerpEnd'
-WIN_DWL_SPLITPARASTART = 'SplitParaStart'
-WIN_DWL_SPLITPARAEND = 'SplitParaEnd'
-WIN_DWL_VERTICALSPLITPARASTART = 'VerticalSplitParaStart'
-WIN_DWL_VERTICALSPLITPARAEND = 'VerticalSplitParaEnd'
-WIN_DWL_VERTICALSPLITPERPSTART = 'VerticalSplitPerpStart'
-WIN_DWL_VERTICALSPLITPERPEND = 'VerticalSplitPerpEnd'
-WIN_DWL_HORIZONTALSPLITPARASTART = 'HorizontalSplitParaStart'
-WIN_DWL_HORIZONTALSPLITPARAEND = 'HorizontalSplitParaEnd'
-WIN_DWL_BOTTOMHORIZONTALSPLITPARASTART = 'BottomHorizontalSplitParaStart'
-WIN_DWL_BOTTOMHORIZONTALSPLITPARAEND = 'BottomHorizontalSplitParaEnd'
-WIN_DWL_HORIZONTALSPLITPERPSTART = 'HorizontalSplitPerpStart'
-WIN_DWL_HORIZONTALSPLITPERPEND = 'HorizontalSplitPerpEnd'
+WIN_DWL_TOP_PERP_LEN = 'TopPerpLen'
+WIN_DWL_TOP_PARA_LEN = 'TopParaLen'
+WIN_DWL_BOTTOM_PERP_LEN = 'BottomPerpLen'
+WIN_DWL_BOTTOM_PARA_LEN = 'BottomParaLen'
+WIN_DWL_RAILBOTTOM_PERP_LEN = 'RailBottomPerpLen'
+WIN_DWL_RAILBOTTOM_PARA_LEN = 'RailBottomParaLen'
+WIN_DWL_SPLIT_PERP_LEN = 'SplitPerpLen'
+WIN_DWL_SPLIT_PARA_LEN = 'SplitParaLen'
+
 
 WIN_PRJ_ORIGSPLIT = 'OrigSplit'
 

Profiles/WinProject.lua

@@ -106,4 +106,9 @@ local function WinCalculate_AddHardware()
 end
 _G.WinCalculate_AddHardware = WinCalculate_AddHardware
 
+local function WinCreate_GetHardwareOptionPath()
+    WDG.HWDOPTPATH = WinCalculate.AddHardwareForSash(WDG.AREAID, true)
+end
+_G.WinCreate_GetHardwareOptionPath = WinCreate_GetHardwareOptionPath
+
 ---------------------------------------------------------------------