diff --git a/js/histojs/analysisFunctionsv12.js b/js/histojs/analysisFunctionsv12.js index 8b7f478..086650d 100644 --- a/js/histojs/analysisFunctionsv12.js +++ b/js/histojs/analysisFunctionsv12.js @@ -6504,53 +6504,100 @@ createCellPhenotypesColorsArray = (numOfValidPhenotypes) => { /*------------------------------------------------------------------------------------------------------------------*/ -// -//
-// -//
-// -// - - -// -// -// + //-- + //--
+ //-- + //--
+ //-- + //-- + + //-- + //-- + //-- + /** + * Get selected composite operation + * + * @function + * @memberof HistoJS + * @since 1.0.0 + * @version 1.0.0 + * @returns {string} e.g. "lighter" + */ getSelectedCompositeOperation = () => { return currentGrpFeaturesSelectionStates.compositeOperation; } + /** + * Set composite operation + * + * @function + * @memberof HistoJS + * @since 1.0.0 + * @version 1.0.0 + */ + setCurCompositeOperation = () => { let curCompositeOperation = document.getElementById("compositeOperations").value; currentGrpFeaturesSelectionStates.compositeOperation = curCompositeOperation; } + /** + * Get selected display option + * + * @function + * @memberof HistoJS + * @since 1.0.0 + * @version 1.0.0 + * @returns {string} e.g. "composite" + */ + getSelectedDisplayOption = () => { return currentGrpFeaturesSelectionStates.displayOption; } + /** + * Set current display option + * + * @function + * @memberof HistoJS + * @since 1.0.0 + * @version 1.0.0 + * @param {Object} curOption + */ + setCurDisplayOption = (curOption) => { currentGrpFeaturesSelectionStates.displayOption = curOption.value; curOption.value !== "composite" ? document.getElementById("compositeOperations").disabled = true : document.getElementById("compositeOperations").disabled = false; } - // compositeChanged = () =>{ - // console.log( document.getElementById("compositeOperations").value ) - // } + //-- compositeChanged = () => { + //-- console.log( document.getElementById("compositeOperations").value ) + //-- } + + + /** + * Confirm button for display changes + * + * @function + * @memberof HistoJS + * @since 1.0.0 + * @version 1.0.0 + */ confirmDisplayChanges = () => { let curGroup = getSelectedGroup(); @@ -6560,12 +6607,12 @@ createCellPhenotypesColorsArray = (numOfValidPhenotypes) => { switch ( getSelectedDisplayOption()){ case 'layers': { - reloadOSD(curGroup, false); // compositeFlag = false + reloadOSD(curGroup, false); //-- compositeFlag = false break; } case 'blend': { - // reloadOSD(curGroup, true, compositeType); + //-- reloadOSD(curGroup, true, compositeType); triggerHint("To be Coded .."); break; } @@ -6588,16 +6635,36 @@ createCellPhenotypesColorsArray = (numOfValidPhenotypes) => { } - requestOperationInfo = () => { + + /** + * Request operation info + * + * @function + * @memberof HistoJS + * @since 1.0.0 + * @version 1.0.0 + */ + + requestOperationInfo = () => { let curOperationValue = document.getElementById("compositeOperations").value; let operationEntry = compositeOperations.filter( operation => operation.type === curOperationValue); - triggerHint(operationEntry[0].description, "info", 7000); + triggerHint(operationEntry[0].description, "info", 7000); } + + /** + * Init group channel display options + * + * @function + * @memberof HistoJS + * @since 1.0.0 + * @version 1.0.0 + */ + initGrpChnlDisplayOptions = () => { - let nodes=""; + let nodes = ""; let sectionTitle = 'Channels Display'; - document.getElementById("grpChnlDisplyOptions").innerHTML=""; + document.getElementById("grpChnlDisplyOptions").innerHTML = ""; nodes += '