diff --git a/Jenkinsfile b/Jenkinsfile index 909d7a5..1b74429 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=228']) { + withEnv(['NEXT_BUILD_NUMBER=229']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_slider.ascx.cs b/NKC_WF/WebUserControls/cmp_slider.ascx.cs index 4523dbc..e95c242 100644 --- a/NKC_WF/WebUserControls/cmp_slider.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_slider.ascx.cs @@ -11,7 +11,6 @@ namespace NKC_WF.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - } protected void txtSlider_TextChanged(object sender, EventArgs e) @@ -30,6 +29,15 @@ namespace NKC_WF.WebUserControls int.TryParse(txtSlider.Text, out answ); return answ; } + set + { + // lo imposto sapendo che รจ fondoscala a 100! + txtSlider.Text = value.ToString(); + } } + /// + /// Fondoscale (hard coded...) + /// + public int resolution = 100; } } \ No newline at end of file diff --git a/NKC_WF/site/BatchPreview.aspx.cs b/NKC_WF/site/BatchPreview.aspx.cs index 7c779b7..16168fc 100644 --- a/NKC_WF/site/BatchPreview.aspx.cs +++ b/NKC_WF/site/BatchPreview.aspx.cs @@ -46,14 +46,21 @@ namespace NKC_WF.site private void Cmp_BP_sheetList_eh_doRefresh(object sender, EventArgs e) { + int numBunk = cmp_BP_bunkList.numBunks; + cmp_slider.selValue = (100 * (cmp_BP_bunkList.selIndex) / numBunk) + ((cmp_BP_sheetList.selIndex * 100) / (cmp_BP_sheetList.numSheets * numBunk)); // imposto sheet sul foglio... cmp_MU_svgViewer.SheetId = cmp_BP_sheetList.SheetIdSel; } private void Cmp_BP_bunkList_eh_doRefresh(object sender, EventArgs e) { + // fix selezione slider... + int numBunk = cmp_BP_bunkList.numBunks; + cmp_slider.selValue = 100 * (cmp_BP_bunkList.selIndex) / numBunk; // aggiorno sheets cmp_BP_sheetList.BunkId = cmp_BP_bunkList.BunkIdSel; + cmp_BP_sheetList.selIndex = 0; + cmp_MU_svgViewer.SheetId = cmp_BP_sheetList.SheetIdSel; } protected int bunkIndex