diff --git a/WebWindowComplex/Compo/CardSplit.razor.cs b/WebWindowComplex/Compo/CardSplit.razor.cs index 8df3b87..60d7ae2 100644 --- a/WebWindowComplex/Compo/CardSplit.razor.cs +++ b/WebWindowComplex/Compo/CardSplit.razor.cs @@ -107,11 +107,11 @@ namespace WebWindowComplex.Compo { currSplit = CurrSplit }; - if (SearchSash(CurrSplit)) - { + // Se la shape selezionata è grid o custom, richiede reset shape + if(value > 2) _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = DataAction.ResetDictShape }); + if (SearchSash(CurrSplit)) _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = DataAction.ResetHwOpt }); - } _ = EC_UpdateSplit.InvokeAsync(args); } } @@ -188,9 +188,10 @@ namespace WebWindowComplex.Compo currRec = currSplitDim; var args = new DataUpdateSplit() { - currSplit = CurrSplit + currSplit = CurrSplit, + noSvg = updRec.noSvg }; - await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = DataAction.ResetDictShape }); + //await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = DataAction.ResetDictShape }); await EC_UpdateSplit.InvokeAsync(args); } } diff --git a/WebWindowComplex/Compo/EditSplitDimensions.razor.cs b/WebWindowComplex/Compo/EditSplitDimensions.razor.cs index 8083619..9948f6a 100644 --- a/WebWindowComplex/Compo/EditSplitDimensions.razor.cs +++ b/WebWindowComplex/Compo/EditSplitDimensions.razor.cs @@ -67,7 +67,8 @@ namespace WebWindowComplex.Compo var args = new DataUpdateSplitDimension() { currSplit = CurrRec, - index=Index + index=Index, + noSvg = true }; _ = EC_Update.InvokeAsync(args); } @@ -145,5 +146,6 @@ namespace WebWindowComplex.Compo { public SplitDimension currSplit { get; set; } = null!; public int index { get; set; } = -1; + public bool noSvg { get; set; } = false; } } \ No newline at end of file diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs index 64eac4b..8a28503 100644 --- a/WebWindowComplex/Models/Area.cs +++ b/WebWindowComplex/Models/Area.cs @@ -180,51 +180,51 @@ namespace WebWindowComplex.Models AreaList[0] = AreaList[1]; AreaList[1] = tempArea; } - Frame f = ParentWindow.AreaList.First(); - switch (f.Shape) + Frame frame = ParentWindow.AreaList.First(); + switch (frame.Shape) { case Shapes.RECTANGLE: case Shapes.ARC_FULL: case Shapes.TRIANGLE: { - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Height")).First().dDimension, "Height"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Height")).First().dDimension, "Height"); break; } case Shapes.RIGHTCHAMFER: { - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Left Height")).First().dDimension, "Left Height"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Left Height")).First().dDimension, "Left Height"); break; } case Shapes.LEFTCHAMFER: { - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Right Height")).First().dDimension, "Right Height"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Right Height")).First().dDimension, "Right Height"); break; } case Shapes.DOUBLECHAMFER: case Shapes.ARC: { - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Full Height")).First().dDimension, "Full Height"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Full Height")).First().dDimension, "Full Height"); break; } case Shapes.DOUBLEARC: { - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Full Height")).First().dDimension, "Full Height"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Full Height")).First().dDimension, "Full Height"); break; } case Shapes.THREECENTERARC: { - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); - SearchAreaList(this, f.DimensionList.Where(x => x.sName.Equals("Full Height")).First().dDimension, "Full Height"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Width")).First().dDimension, "Width"); + SearchAreaList(this, frame.DimensionList.Where(x => x.sName.Equals("Full Height")).First().dDimension, "Full Height"); break; } } @@ -293,23 +293,23 @@ namespace WebWindowComplex.Models int countProportional = sash.SashList.Where(x => x.MeasureType.Equals(MeasureTypes.PROPORTIONAL)).Count(); int countPercentage = sash.SashList.Where(x => x.MeasureType.Equals(MeasureTypes.PERCENTAGE)).Count(); List dimList = new List(); - Split temp = new Split(null, null); + Split split = new Split(null, null); if (sash.ParentArea.ParentArea is Split) - temp = (Split)sash.ParentArea.ParentArea; - if (sash.ParentArea is Frame || (sash.ParentArea.ParentArea is Split && temp.SplitHorizList.Count > 0)) + split = (Split)sash.ParentArea.ParentArea; + if (sash.ParentArea is Frame || (sash.ParentArea.ParentArea is Split && split.SplitHorizList.Count > 0)) { - Frame f = null; - if(temp.SplitHorizList.Count > 0) - f = (Frame)sash.ParentArea.ParentArea.ParentArea; + Frame frame = new Frame(null, null); + if(split.SplitHorizList.Count > 0) + frame = (Frame)sash.ParentArea.ParentArea.ParentArea; else - f = (Frame)sash.ParentArea; - foreach (var i in f.DimensionList) + frame = (Frame)sash.ParentArea; + foreach (var i in frame.DimensionList) dimList.Add(new AreaDimension(i.dDimension, i.SelMeasureType)); } else { - Split s = (Split)sash.ParentArea.ParentArea; - foreach (var i in s.SplitVertList) + //Split s = (Split)sash.ParentArea.ParentArea; + foreach (var i in split.SplitVertList) dimList.Add(new AreaDimension(i.dDimension, i.SelMeasureType)); } if (countAbsolute == sash.SashList.Count) @@ -348,7 +348,7 @@ namespace WebWindowComplex.Models else if (area is Split) { Split split = (Split)area; - List splitList = null; + List splitList = new List(); if (nameDim.Equals("Width")) splitList = split.SplitVertList; else diff --git a/WebWindowComplex/Models/Frame.cs b/WebWindowComplex/Models/Frame.cs index 663e8a9..a4fc123 100644 --- a/WebWindowComplex/Models/Frame.cs +++ b/WebWindowComplex/Models/Frame.cs @@ -357,6 +357,32 @@ namespace WebWindowComplex.Models m_ThresholdList.Clear(); m_ThresholdList = m_AllThresholdList.GetValueOrDefault(ParentWindow.sProfilePath); } + + public double HeightFrame() + { + switch (SelShapeIndex) + { + case (int)Shapes.RECTANGLE: + case (int)Shapes.TRIANGLE: + case (int)Shapes.ARC_FULL: + { + return DimensionList.Where(x => x.sName == "Height").First().dDimension; + } + case (int)Shapes.RIGHTCHAMFER: + { + return DimensionList.Where(x => x.sName == "Left Height").First().dDimension; + } + case (int)Shapes.LEFTCHAMFER: + { + return DimensionList.Where(x => x.sName == "Right Height").First().dDimension; + } + default: + { + return DimensionList.Where(x => x.sName == "Full Height").First().dDimension; + } + } + } + public override Frame Copy(Area ParentArea) { return null; diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index 20afcfd..79098e9 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -34,18 +34,6 @@ namespace WebWindowComplex.Models #region Public Properties - //public bool bIsMeasureGlass - //{ - // get - // { - // return m_bIsMeasureGlass; - // } - // set - // { - // m_bIsMeasureGlass = value; - // } - //} - public bool bIsSashVertical { get @@ -485,7 +473,6 @@ namespace WebWindowComplex.Models Fill newFill = Fill.CreateFill(ParentArea, FillTypes.GLASS); newFill.SetAreaType(AreaTypes.FILL); ParentArea.AreaList.Add(newFill); - //m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized()); } public void SetSelFamilyHardware(string sFamilyHw) @@ -508,7 +495,6 @@ namespace WebWindowComplex.Models public void UpdateShape(string newShape) { m_CurrShape = newShape; - bool noHwValid = false; // la famiglia hw è vuota seleziono il primo hardware valido e utilizzo la sua famiglia if(string.IsNullOrEmpty(m_SelFamilyHardware) || m_SelFamilyHardware == "") { @@ -519,7 +505,6 @@ namespace WebWindowComplex.Models ); if(listHwValid == null) { - noHwValid = true; var familyHwValid = Sash.m_HardwareCompleteList .Select(x => x.FamilyName) .First(); @@ -815,8 +800,6 @@ namespace WebWindowComplex.Models for (var SplitIndex = m_SashList.Count; SplitIndex <= Qty - 1; SplitIndex++) { SashDimension newSashDim = new SashDimension(dNewDimension, MeasureTypes.PERCENTAGE, this, SplitIndex + 1); - //for (var JointIndex = 0; JointIndex <= 3; JointIndex++) - // newSashDim.JointList.Add(new Joint(this, JointIndex + 1, Joints.FULL_H)); SashList.Add(newSashDim); } } @@ -883,8 +866,6 @@ namespace WebWindowComplex.Models private List m_HwOptionList = new List(); private Dictionary m_SelHwOptionList = new Dictionary(); - //private List m_JointList = new List(); - private int m_nSashBottomRailQty; private List m_OrientationSashTypeList = new List diff --git a/WebWindowComplex/Models/Split.cs b/WebWindowComplex/Models/Split.cs index 617edd9..615dd7e 100644 --- a/WebWindowComplex/Models/Split.cs +++ b/WebWindowComplex/Models/Split.cs @@ -186,14 +186,23 @@ namespace WebWindowComplex.Models // Ricalcolo dimensioni rimuovendo split else { - double dLastDimension = 0; - for (var SplitIndex = m_SplitVertList.Count - 1; SplitIndex >= value + 1; SplitIndex += -1) + int countProportional = m_SplitVertList.Count(x => x.MeasureType.Equals(MeasureTypes.PROPORTIONAL)); + if(m_SplitVertList.Last().MeasureType.Equals(MeasureTypes.PROPORTIONAL) && countProportional - 1 == 1) { - dLastDimension += m_SplitVertList[SplitIndex].dDimension; - m_SplitVertList.RemoveAt(SplitIndex); + m_SplitVertList.RemoveAt(m_SplitVertList.Count() - 1); + m_SplitVertList.Where(x => x.MeasureType.Equals(MeasureTypes.PROPORTIONAL)).FirstOrDefault().SetDimension(1); + } + else + { + double dLastDimension = 0; + for (var SplitIndex = m_SplitVertList.Count - 1; SplitIndex >= value + 1; SplitIndex += -1) + { + dLastDimension += m_SplitVertList[SplitIndex].dDimension; + m_SplitVertList.RemoveAt(SplitIndex); + } + dLastDimension += m_SplitVertList[m_SplitVertList.Count - 1].dDimension; + m_SplitVertList[m_SplitVertList.Count - 1].SetDimension(dLastDimension); } - dLastDimension += m_SplitVertList[m_SplitVertList.Count - 1].dDimension; - m_SplitVertList[m_SplitVertList.Count - 1].SetDimension(dLastDimension); } // Controllo quanti split orizzontali ci sono int nHoriz = m_SplitHorizList.Count > 0 ? m_SplitHorizList.Count : 1; @@ -251,9 +260,9 @@ namespace WebWindowComplex.Models } set { + SplitShapes OldSelShapeSplit = m_SelSplitShape; m_SelSplitShape = (SplitShapes)value; - // Cancello elementi nello split e azzero quantità orizzontale e verticale - AreaList.Clear(); + // Azzero quantità orizzontale e verticale SetSplitQtyVert(0); SetSplitQtyHoriz(0); if (m_SelSplitShape == SplitShapes.VERTICAL) @@ -275,15 +284,20 @@ namespace WebWindowComplex.Models SetSplitQtyHoriz(1); SetSplitStartVert(true); } - // Aggiungo area Splitted e vetro - int nVert = m_SplitVertList.Count > 0 ? m_SplitVertList.Count : 1; - int nHoriz = m_SplitHorizList.Count > 0 ? m_SplitHorizList.Count : 1; - for (var SplitIndex = 0; SplitIndex <= (nVert * nHoriz) - 1; SplitIndex++) + if(OldSelShapeSplit == SplitShapes.GRID || m_SelSplitShape == SplitShapes.GRID) { - AreaList.Add(Splitted.CreateSplitted(this)); - Fill newFill = Fill.CreateFill(AreaList[SplitIndex], FillTypes.GLASS); - newFill.SetAreaType(AreaTypes.FILL); - AreaList[SplitIndex].AreaList.Add(newFill); + // Cancello vecchio contenuto dello split + AreaList.Clear(); + // Aggiungo area Splitted e vetro + int nVert = m_SplitVertList.Count > 0 ? m_SplitVertList.Count : 1; + int nHoriz = m_SplitHorizList.Count > 0 ? m_SplitHorizList.Count : 1; + for (var SplitIndex = 0; SplitIndex <= (nVert * nHoriz) - 1; SplitIndex++) + { + AreaList.Add(Splitted.CreateSplitted(this)); + Fill newFill = Fill.CreateFill(AreaList[SplitIndex], FillTypes.GLASS); + newFill.SetAreaType(AreaTypes.FILL); + AreaList[SplitIndex].AreaList.Add(newFill); + } } } } diff --git a/WebWindowComplex/Models/SplitDimension.cs b/WebWindowComplex/Models/SplitDimension.cs index 7bd0c7b..0604437 100644 --- a/WebWindowComplex/Models/SplitDimension.cs +++ b/WebWindowComplex/Models/SplitDimension.cs @@ -51,16 +51,17 @@ namespace WebWindowComplex.Models { double dimensionTot = 0; List dimensions = null; - List frames = m_Parent.ParentWindow.AreaList; + Frame frame = m_Parent.ParentWindow.AreaList.FirstOrDefault(); if (bIsVertListDim) { dimensions = m_Parent.SplitVertList; - dimensionTot = CalculateWidthSplitGroup(frames.FirstOrDefault(), frames.FirstOrDefault().DimensionList.Where(x => x.sName == "Width").First().dDimension, new AreaFound(-1, false)).m_Dimension; + dimensionTot = CalculateWidthSplitGroup(frame, frame.DimensionList.Where(x => x.sName == "Width").First().dDimension, new AreaFound(-1, false)).m_Dimension; } else { dimensions = m_Parent.SplitHorizList; - dimensionTot = (CalculateHeightSplitGroup(m_Parent, HeightTot(), new AreaFound(-1, false))).m_Dimension; + //dimensionTot = (CalculateHeightSplitGroup(m_Parent, HeightTot(), new AreaFound(-1, false))).m_Dimension; + dimensionTot = (CalculateHeightSplitGroup(frame, frame.HeightFrame(), new AreaFound(-1, false))).m_Dimension; } double valMinAbsolute = 100; double valMaxAbsolute = dimensionTot - valMinAbsolute * (dimensions.Count - 1); @@ -214,7 +215,6 @@ namespace WebWindowComplex.Models for (int i = 0; i < absoluteValList.Count; i++) { var item = dimensions.ElementAt(i); - //item.SetDimension(ConvertIn(absoluteValList[i], (MeasureTypes)item.SelMeasureTypeIndex, dimensionTot, dimensions)); item.SetDimension(ad.ConvertIn(adList, absoluteValList[i], (MeasureTypes)item.SelMeasureTypeIndex, dimensionTot)); } } @@ -281,17 +281,17 @@ namespace WebWindowComplex.Models { MeasureTypes newType = (MeasureTypes)value; List splitList = null; - List frameList = m_Parent.ParentWindow.AreaList; + Frame frame = m_Parent.ParentWindow.AreaList.FirstOrDefault(); double tot = 0; if (bIsVertListDim) { splitList = m_Parent.SplitVertList; - tot = CalculateWidthSplitGroup(frameList.FirstOrDefault(), frameList.FirstOrDefault().DimensionList.Where(x => x.sName == "Width").First().dDimension, new AreaFound(-1, false)).m_Dimension; + tot = CalculateWidthSplitGroup(frame, frame.DimensionList.Where(x => x.sName == "Width").First().dDimension, new AreaFound(-1, false)).m_Dimension; } else { splitList = m_Parent.SplitHorizList; - tot = (CalculateHeightSplitGroup(frameList.FirstOrDefault(), HeightTot(), new AreaFound(-1, false))).m_Dimension; + tot = (CalculateHeightSplitGroup(frame, frame.HeightFrame(), new AreaFound(-1, false))).m_Dimension; } AreaDimension ad = new AreaDimension(dDimension, SelMeasureType); List adList = new List(); @@ -301,7 +301,6 @@ namespace WebWindowComplex.Models } m_dDimension = ad.ConvertDimension(adList, m_SelMeasureType, newType, tot, splitList.IndexOf(this)); m_SelMeasureType = (MeasureTypes)value; - //m_Parent.ParentWindow.OnUpdatePreview(m_Parent.ParentWindow.sSerialized()); } } } @@ -376,6 +375,7 @@ namespace WebWindowComplex.Models /// /// area di partenza /// larghezza di partenza + /// area di ritorno /// internal AreaFound CalculateWidthSplitGroup(Area area, double width, AreaFound res) { @@ -422,8 +422,6 @@ namespace WebWindowComplex.Models } if (res.m_Dimension != -1 && res.m_Found) return res; - //if (risultato != -1) - // return risultato; } else { @@ -477,6 +475,7 @@ namespace WebWindowComplex.Models /// /// area di partenza /// altezza di partenza + /// area di ritorno /// internal AreaFound CalculateHeightSplitGroup(Area area, double height, AreaFound res) { @@ -501,7 +500,8 @@ namespace WebWindowComplex.Models { case MeasureTypes.ABSOLUTE: { - res = CalculateHeightSplitGroup(item, split.SplitHorizList.ElementAt(index).dDimension, res); + double heightItemGroup = split.SplitHorizList.ElementAt(index).dDimension; + res = CalculateHeightSplitGroup(item, heightItemGroup, res); break; } case MeasureTypes.PROPORTIONAL: @@ -512,19 +512,19 @@ namespace WebWindowComplex.Models { adList.Add(new AreaDimension(it.dDimension, it.SelMeasureType)); } - res = CalculateHeightSplitGroup(item, ad.ConvertFromPropVal(adList, MeasureTypes.ABSOLUTE, height), res); + double heightItemGroup = ad.ConvertFromPropVal(adList, MeasureTypes.ABSOLUTE, height); + res = CalculateHeightSplitGroup(item, heightItemGroup, res); break; } case MeasureTypes.PERCENTAGE: { - res = CalculateHeightSplitGroup(item, split.SplitHorizList.ElementAt(index).dDimension * height / 100, res); + double heightItemGroup = split.SplitHorizList.ElementAt(index).dDimension * height / 100; + res = CalculateHeightSplitGroup(item, heightItemGroup, res); break; } } if (res.m_Dimension != -1 && res.m_Found) return res; - //if (risultato != -1 && foundObj) - // return risultato; } else { @@ -741,18 +741,18 @@ namespace WebWindowComplex.Models if (m_SelMeasureType != (MeasureTypes)value) { MeasureTypes newType = (MeasureTypes)value; - List frames = m_Parent.ParentWindow.AreaList; - double tot = 0; + Frame frame = m_Parent.ParentWindow.AreaList.FirstOrDefault(); + double dimSplitGroup = 0; if (bIsVertListDim) { - tot = (CalculateWidthSplitGroup(frames.FirstOrDefault(), frames.FirstOrDefault().DimensionList.Where(x => x.sName == "Width").First().dDimension, new AreaFound(-1, false))).m_Dimension; + dimSplitGroup = (CalculateWidthSplitGroup(frame, frame.DimensionList.Where(x => x.sName == "Width").First().dDimension, new AreaFound(-1, false))).m_Dimension; AreaDimension ad = new AreaDimension(dDimension, SelMeasureType); List newDimensions = new List(); foreach (var item in m_Parent.SplitVertList) { newDimensions.Add(new AreaDimension(item.dDimension, item.SelMeasureType)); } - m_dDimension = ad.ConvertDimension(newDimensions, m_SelMeasureType, newType, tot, m_Parent.SplitVertList.IndexOf(this)); + m_dDimension = ad.ConvertDimension(newDimensions, m_SelMeasureType, newType, dimSplitGroup, m_Parent.SplitVertList.IndexOf(this)); if (newType is MeasureTypes.PROPORTIONAL) { for (int i = 0; i < m_Parent.SplitVertList.Count; i++) @@ -762,14 +762,15 @@ namespace WebWindowComplex.Models } } else { - tot = (CalculateHeightSplitGroup(m_Parent, HeightTot(), new AreaFound(-1, false))).m_Dimension; + //tot = (CalculateHeightSplitGroup(m_Parent, HeightTot(), new AreaFound(-1, false))).m_Dimension; + dimSplitGroup = (CalculateHeightSplitGroup(frame, frame.HeightFrame(), new AreaFound(-1, false))).m_Dimension; AreaDimension ad = new AreaDimension(dDimension, SelMeasureType); List newDimensions = new List(); foreach (var item in m_Parent.SplitHorizList) { newDimensions.Add(new AreaDimension(item.dDimension, item.SelMeasureType)); } - m_dDimension = ad.ConvertDimension(newDimensions, m_SelMeasureType, newType, tot, m_Parent.SplitHorizList.IndexOf(this)); + m_dDimension = ad.ConvertDimension(newDimensions, m_SelMeasureType, newType, dimSplitGroup, m_Parent.SplitHorizList.IndexOf(this)); if(newType is MeasureTypes.PROPORTIONAL) { for(int i = 0; i < m_Parent.SplitHorizList.Count; i++) @@ -782,32 +783,6 @@ namespace WebWindowComplex.Models } } - internal double HeightTot() - { - List frames = m_Parent.ParentWindow.AreaList; - switch (frames.First().SelShapeIndex) - { - case (int)Shapes.RECTANGLE: - case (int)Shapes.TRIANGLE: - case (int)Shapes.ARC_FULL: - { - return (CalculateHeightSplitGroup(frames.FirstOrDefault(), frames.FirstOrDefault().DimensionList.Where(x => x.sName == "Height").First().dDimension, new AreaFound(-1, false))).m_Dimension; - } - case (int)Shapes.RIGHTCHAMFER: - { - return (CalculateHeightSplitGroup(frames.FirstOrDefault(), frames.FirstOrDefault().DimensionList.Where(x => x.sName == "Left Height").First().dDimension, new AreaFound(-1, false))).m_Dimension; - } - case (int)Shapes.LEFTCHAMFER: - { - return (CalculateHeightSplitGroup(frames.FirstOrDefault(), frames.FirstOrDefault().DimensionList.Where(x => x.sName == "Right Height").First().dDimension, new AreaFound(-1, false))).m_Dimension; - } - default: - { - return (CalculateHeightSplitGroup(frames.FirstOrDefault(), frames.FirstOrDefault().DimensionList.Where(x => x.sName == "Full Height").First().dDimension, new AreaFound(-1, false))).m_Dimension; - } - } - } - #endregion Internal Methods #region Private Fields diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 5433b75..812f6e0 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.12.2912 + 2.7.1.1316 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -453,6 +453,12 @@ + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 4aacc97..cb5d0b8 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.12.2912 + 2.7.1.1316 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -567,6 +567,25 @@ + + + + + + + + + + + + + + + + + + +