- Timestamp:
- 03/08/13 11:00:04 (11 years ago)
- Location:
- geisa/web
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
geisa/web/initGeisa.jsp
r757 r762 37 37 38 38 39 <div id="informationContents" class="information"> This tool allows you to draw thespectroscopic parameters in function of the wavenumber. Please select the parameters to draw your own graph.40 < br>41 For further information, please download the <a href="#">user manual</a>. 39 <div id="informationContents" class="information"> This tool allows you to draw spectroscopic parameters in function of the wavenumber. Please select the parameters to draw your own graph. 40 <!--<br> 41 For further information, please download the <a href="#">user manual</a>. --> 42 42 </div> 43 43 44 44 <div style="display:none;" id="informationGlobal" class="information"> This tool allows you to see the line positions of several molecules or isotopologues in a chosen spectral range. 45 < br>46 For further information, please download the <a href="#">user manual</a>. 45 <!--<br> 46 For further information, please download the <a href="#">user manual</a>. --> 47 47 </div> 48 48 49 49 <div style="display:none;" id="informationComparison" class="information"> This tool allows you to compare different databases content. 50 < br>51 For further information, please download the <a href="#">user manual</a>. 50 <!--<br> 51 For further information, please download the <a href="#">user manual</a>. --> 52 52 </div> 53 53 … … 105 105 106 106 <div id="axeY1Gene" class="axeY1Gene"> 107 <fieldset class="options"><legend><b>Choosing line transition parameter : </b><a href="#" TITLE="Selection of spectral parameter to draw (intensity, HWM ..etc.) according to wavenumbers. Note that, itâs possible to draw also the number of transitions when a bin-average greater than 0 is chosen (see advanced options). "><img src="resources/images/elements/index .jpeg" height="16px" width="16px"></a> </legend>107 <fieldset class="options"><legend><b>Choosing line transition parameter : </b><a href="#" TITLE="Selection of spectral parameter to draw (intensity, HWM ..etc.) according to wavenumbers. Note that, itâs possible to draw also the number of transitions when a bin-average greater than 0 is chosen (see advanced options). "><img src="resources/images/elements/index-or.jpeg" height="16px" width="16px"></a> </legend> 108 108 <div id="axeY1" class="containerInsideOptions"></div> 109 109 </fieldset> … … 133 133 <fieldset class="general"><legend><span class="fieldsetGeneralTitle">Advanced Options :</span></legend> 134 134 <div id="transition" class="transition"> 135 <fieldset class="options"><legend> <b>Choosing vibrational transitions : </b><a href="#" TITLE="Selection of an upper and/or a lower vibrational state related to one given molecule. The list of available states depends on the chosen molecule and on the spectral interval."><img src="resources/images/elements/index .jpeg" height="16px" width="16px"></a></legend>135 <fieldset class="options"><legend> <b>Choosing vibrational transitions : </b><a href="#" TITLE="Selection of an upper and/or a lower vibrational state related to one given molecule. The list of available states depends on the chosen molecule and on the spectral interval."><img src="resources/images/elements/index-or.jpeg" height="16px" width="16px"></a></legend> 136 136 <div id="transitionValue" class="transitionValue"> 137 137 <div id="transitionUpper" class="containerInsideOptions"></div> … … 144 144 145 145 <div id="meanValue" class="meanValue"> 146 <fieldset class="options"><legend> <b>Parameter mean values : </b><a href="#" TITLE="To draw average values of the selected parameter, choose a bin-average greater than 0. The bin-average is the step according to which the averages values are calculated. "><img src="resources/images/elements/index .jpeg" height="16px" width="16px"></a></legend>146 <fieldset class="options"><legend> <b>Parameter mean values : </b><a href="#" TITLE="To draw average values of the selected parameter, choose a bin-average greater than 0. The bin-average is the step according to which the averages values are calculated. "><img src="resources/images/elements/index-or.jpeg" height="16px" width="16px"></a></legend> 147 147 <div id="meanValue1" class="containerInsideOptions"></div> 148 148 <!--Pour l'onglet "Database comparison" --> … … 154 154 155 155 <div id="axeY2Gene" class="axeY2Gene"> 156 <fieldset class="options"><legend> <b>Choosing secondary line transition parameter : </b><a href="#" TITLE="Optional option, for drawing a secondary parameter (coupled with the primary one)."><img src="resources/images/elements/index .jpeg" height="16px" width="16px"></a></legend>156 <fieldset class="options"><legend> <b>Choosing secondary line transition parameter : </b><a href="#" TITLE="Optional option, for drawing a secondary parameter (coupled with the primary one)."><img src="resources/images/elements/index-or.jpeg" height="16px" width="16px"></a></legend> 157 157 <div id="axeY2Titre" class="containerInsideOptions"></div> 158 158 <div id="axeY2" class="containerInsideOptions"></div> -
geisa/web/initGeisa_script.jsp
r757 r762 521 521 document.getElementById("spectralRangeLower").innerHTML = "Lower value, cm<sup>-1</sup> : "; 522 522 document.getElementById("spectralRangeUpper").innerHTML = "Upper value, cm<sup>-1</sup> : "; 523 document.getElementById("samplingStep").innerHTML = "<br> Splitting step, cm<sup>-1</sup> : <a href='#' TITLE='Split equally the selected spectral range for generating a series of graphs. Default case: one graph for the whole spectral range.'><img src='resources/images/elements/index .jpeg' height='16px' width='16px'></a> ";523 document.getElementById("samplingStep").innerHTML = "<br> Splitting step, cm<sup>-1</sup> : <a href='#' TITLE='Split equally the selected spectral range for generating a series of graphs. Default case: one graph for the whole spectral range.'><img src='resources/images/elements/index-or.jpeg' height='16px' width='16px'></a> "; 524 524 //zone texte SpectralRangeLower 525 525 var inputSpectralRangeLower = $( document.createElement( "input" ) ); … … 593 593 paramNbCourbes.parent = $("#nbCourbes"); 594 594 this.selectNbCourbes = new Select( paramNbCourbes ); 595 this.selectNbCourbes.add( 'ca', "One curve for all select ion", jQuery.proxy(this.onClickSelectNbCourbes, this ) );595 this.selectNbCourbes.add( 'ca', "One curve for all selected molecules", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 596 596 this.selectNbCourbes.add( 'cm', "Separated molecules : same graph", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 597 597 this.selectNbCourbes.add( 'gm', "Separated molecules : different graphs", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); … … 683 683 //Zone text Mean Value Bin-average 684 684 //Titre 685 var titleMeanValue = document.createTextNode("Bin-average : "); 686 document.getElementById("meanValue1").appendChild(titleMeanValue); 685 document.getElementById("meanValue1").innerHTML = "Bin-average, cm<sup>-1</sup> : "; 686 //var titleMeanValue = document.createTextNode("Bin-average : "); 687 //document.getElementById("meanValue1").appendChild(titleMeanValue); 687 688 //champ input 688 689 var inputMeanValue = $( document.createElement( "input" ) ); … … 761 762 // Create case à cocher choix de la sortie pour l'onglet "Database comparison" 762 763 //Titre 763 var titleOutput = document.createTextNode("Mean value output choice (if Bin-average>0) : "); 764 document.getElementById("outputChoiceTitre").appendChild(titleOutput); 764 // var titleOutput = document.createTextNode("Mean value output choice (if Bin-average>0) : "); 765 // document.getElementById("outputChoiceTitre").appendChild(titleOutput); 766 document.getElementById("outputChoiceTitre").innerHTML = "Mean value output choice (if Bin-average>0) : <a href='#' TITLE='Drawing differences is only available when a bin-average greater than 0 is chosen.'><img src='resources/images/elements/index-or.jpeg' height='16px' width='16px'></a> "; 767 765 768 //case à cocher 766 769 var titleDifferences = document.createTextNode("Differences "); … … 918 921 break; 919 922 case 'GEISA2011': 920 paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+this.NomRepFileOut+" -filein "+this.pathProcess+"line_GEISA20 09_bin-database_name GEISA2011 -database_type gs08 -type_out png";923 paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+this.NomRepFileOut+" -filein "+this.pathProcess+"line_GEISA2011_bin_gs08_v1.0 -database_name GEISA2011 -database_type gs08 -type_out png"; 921 924 break; 922 925 case 'GEISAIASI2003': … … 1040 1043 nbCourbes = "-separate_mol "; 1041 1044 this.nbGraph = this.nbMolecules; 1042 if (this.nbGraph > 20) {1043 alert("Too much molecules selected to draw one graph for each molecules selected (> 20)");1045 if (this.nbGraph > 50) { 1046 alert("Too much molecules selected to draw one graph for each molecules selected (>50)"); 1044 1047 return; 1045 1048 } … … 1048 1051 nbCourbes = "-separate_iso "; 1049 1052 this.nbGraph = this.nbIsotopes; 1050 if (this.nbGraph > 20) {1051 alert("Too much isotopologues selected to draw one graph for each isotopologues selected (> 20)");1053 if (this.nbGraph > 50) { 1054 alert("Too much isotopologues selected to draw one graph for each isotopologues selected (>50)"); 1052 1055 return; 1053 1056 } … … 1176 1179 1177 1180 //test sur le nombre de graphs générés 1178 if (this.nbGraph > 20)1181 if (this.nbGraph > 50) 1179 1182 { 1180 1183 alert("Too many graphics will be drawn ("+this.nbGraph+"). Please change the value of the sampling step or change the type of graph."); … … 1939 1942 //pour effacer le menu déroulant 1940 1943 this.selectNbCourbes.clear(); 1941 this.selectNbCourbes.add( 'ca', "One curve for all select ion", jQuery.proxy(this.onClickSelectNbCourbes, this ) );1944 this.selectNbCourbes.add( 'ca', "One curve for all selected molecules", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 1942 1945 this.selectNbCourbes.add( 'cm', "Separated molecules : same graph", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 1943 1946 this.selectNbCourbes.add( 'gm', "Separated molecules : different graphs", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); … … 2075 2078 2076 2079 this.selectNbCourbes.clear(); 2077 this.selectNbCourbes.add( 'ca', "One curve for all select ion", jQuery.proxy(this.onClickSelectNbCourbes, this ) );2080 this.selectNbCourbes.add( 'ca', "One curve for all selected molecules", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 2078 2081 this.selectNbCourbes.add( 'gm', "Separated molecules : different graphs", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 2079 2082 this.selectNbCourbes.add( 'gi', "Separated isotopologues : different graphs", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); -
geisa/web/src/com/ether/Controller.java
r757 r762 83 83 final String lastFileName = "endFile"; 84 84 final File lastFile = new java.io.File(LONG_PATH_IMAGES+NomRepFileOut+lastFileName); 85 final Integer maxTimeWait = 6 5000;85 final Integer maxTimeWait = 68000; 86 86 87 87 … … 283 283 284 284 //local 285 public static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether/";285 public static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether/"; 286 286 //naboo 287 287 // public static final String PATH_PROCESS = "/home/www/GEISA/"; 288 288 private static final String VIEW_INIT = "init"; 289 289 private static final String VIEW_INIT2 = "initGeisa";
Note: See TracChangeset
for help on using the changeset viewer.