Index: development/Visualisatie_3D/Parametric_3D_models/LBX.json =================================================================== diff -u -r119 -r131 --- development/Visualisatie_3D/Parametric_3D_models/LBX.json (.../LBX.json) (revision 119) +++ development/Visualisatie_3D/Parametric_3D_models/LBX.json (.../LBX.json) (revision 131) @@ -9,7 +9,7 @@ "source": "/CB_VW_ConfiguratorTAB/CB_VW_Colours/C_LBX_BaseColour" }, "InternalWidth": { - "default": 564.1, + "default": 564.01, "source": [ "/CB_VW_ConfiguratorTAB/CB_VW_Dimensies/C_BOX_InternalWidth.View", "/CB_VW_ViewSection3/CB_VW_NeededFor3D/C_BOX_InternalWidth" @@ -163,11 +163,11 @@ }, "CutOutCode_Z1": { "default": "SY_Square_M_D240_B160", - "source": "/CB_VW_ConfiguratorTAB/CB_VW_UitsparingSifonlade/CB_VW_Section_NoTitle/CB_GRID_4/C_LBX_CutOutCode.Z1" + "source": "/CB_VW_ConfiguratorTAB/CB_VW_UitsparingSifonlade/CB_VW_Section_NoTitle/CB_GRID_5/C_LBX_CutOutCode.Z1" }, "CutOutCode_Z2": { "default": "SY_Square_M_D240_B160", - "source": "/CB_VW_ConfiguratorTAB/CB_VW_UitsparingSifonlade/CB_VW_Section_NoTitle/CB_GRID_4/C_LBX_CutOutCode.Z2" + "source": "/CB_VW_ConfiguratorTAB/CB_VW_UitsparingSifonlade/CB_VW_Section_NoTitle/CB_GRID_5/C_LBX_CutOutCode.Z2" }, "HasDoubleCutOut": { "default": 0, @@ -177,6 +177,14 @@ "default": 0, "source": "/CB_VW_ViewSection3/CB_VW_NeededFor3D/C_BOX_Visu3D.HasSiphonCapCutOut" }, + "SugWidthIsApplicable": { + "default": 0, + "source": "/CB_VW_ViewSection3/CB_VW_NeededFor3D/C_BOX_SugWd.IsApplicable.Bool" + }, + "Visu3DHasValidDimensions": { + "default": 0, + "source": "/CB_VW_ViewSection3/CB_VW_NeededFor3D/C_BOX_Visu3D.HasValidDimensions" + }, "CrossGalleryQuantity": { "default": 0, "source": "/CB_VW_ConfiguratorTAB/CB_VW_Afwerking/C_BOX_CrossGalleryQuantity" @@ -191,15 +199,15 @@ }, "CutOutData_LeftX_Width_Suggested": { "default": 520, - "source": "/CB_VW_ConfiguratorTAB/CB_VW_UitsparingSifonlade/CB_VW_Section_NoTitle/CB_GRID_4/C_BOX_SugWd.LeftX.SuggestedWidth" + "source": "/CB_VW_ConfiguratorTAB/CB_VW_UitsparingSifonlade/CB_VW_Section_NoTitle/CB_GRID_5/C_BOX_SugWd.LeftX.SuggestedWidth" }, "CutOutData_CenterM_Width_Customer": { "default": 0, "source": "/CB_VW_ViewSection3/CB_VW_NeededFor3D/C_BOX_CutOutData.CenterM.Width" }, "CutOutData_CenterM_Width_Suggested": { "default": 97, - "source": "/CB_VW_ConfiguratorTAB/CB_VW_UitsparingSifonlade/CB_VW_Section_NoTitle/CB_GRID_4/C_BOX_SugWd.CenterM.SuggestedWidth" + "source": "/CB_VW_ConfiguratorTAB/CB_VW_UitsparingSifonlade/CB_VW_Section_NoTitle/CB_GRID_5/C_BOX_SugWd.CenterM.SuggestedWidth" }, "CutOutData_CapZ1_Width": { "default": 160, @@ -325,7 +333,7 @@ }, "var": [ "VARSECTIE = '**************************************GENERAL*****************************************' ", - "CabinetWidth_IsValid = is(IsSiphon, 1) ? ( is(InternalWidth, TotalWidth) ? 1 : 0 ) : is(InternalWidth, 564.1) ? 0 : 1", + "CabinetWidth_IsValid = is(IsSiphon, 1) ? ( (is(SugWidthIsApplicable, 1) or is(Visu3DHasValidDimensions, 1) ) ? 1 : 0 ) : is(InternalWidth, 564.01) ? 0 : 1", "InternalWidthFor3D = is(Application, 'SST') ? PlinthWidth - 136 : is(CabinetWidth_IsValid, 1) ? InternalWidth : is(IsSink, 1) ? 564 : is(IsSiphon, 1) ? 1200 : 564", "ChipBoardThickness = 16", "BaseRabbetWidth = 38",