- Timestamp:
- 12/21/12 15:50:54 (12 years ago)
- Location:
- geisa/web
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
geisa/web/initGeisa.jsp
r689 r690 37 37 38 38 39 <div id="informationContents" class="information"> This tool is to draw spectroscopic parameters in fonction of wave number. 40 Please select the differents parameters to draw your own graph. 41 <br> 39 <div id="informationContents" class="information"> This tool allows you to draw the spectroscopic parameters in function of the wavenumber. Please select the parameters to draw your own graph. 40 <br> 42 41 For further information, please download the <a href="#">user manual</a>. 43 42 </div> -
geisa/web/initGeisa_script.jsp
r689 r690 534 534 inputSpectralRangeUpper.bind( 'blur', this, jQuery.proxy( this.requestTransition, this )); 535 535 this.containerFormSpectralRangeUpper.append( inputSpectralRangeUpper ); 536 //zone texte Sampling step 536 //zone texte Sampling step Splitting step 537 537 var inputSamplingStep = $( document.createElement( "input" ) ); 538 538 inputSamplingStep.attr( {id:"sampStep", size:6} ); 539 539 $("#samplingStep").append( inputSamplingStep ); 540 541 542 540 543 541 544 //Zone texte Intensity … … 674 677 675 678 676 //Zone text Mean Value 679 //Zone text Mean Value Bin-average 677 680 //Titre 678 681 var titleMeanValue = document.createTextNode("Bin-average : "); … … 747 750 this.selectOutputDatabasecomparison = new Select( paramoutputDatabasecomparison ); 748 751 this.selectOutputDatabasecomparison.add( 'def', "Default output" ); 749 this.selectOutputDatabasecomparison.add( 'diff_step', " différences moyennes" );750 this.selectOutputDatabasecomparison.add( 'diff_step100', " différences moyennes en pourc" );751 this.selectOutputDatabasecomparison.add( 'diff_stepboth', " diff moy et diff moy en pourc" );752 this.selectOutputDatabasecomparison.add( 'diff_step', "Mean difference" ); 753 this.selectOutputDatabasecomparison.add( 'diff_step100', "Mean difference in percentage" ); 754 this.selectOutputDatabasecomparison.add( 'diff_stepboth', "Both mean difference" ); 752 755 this.selectOutputDatabasecomparison.selectFirst( false ); 753 756 … … 755 758 //création de l'image d'attente 756 759 var param = new Object(); 757 param.id = "loadingForGraphics";758 param.parent = this.containerLoading;759 this.loadingGraphics = new Loading( param );760 // this.loadingGraphics.display();761 //this.loadingGraphics.hide();760 param.id = "loadingForGraphics"; 761 param.parent = this.containerLoading; 762 this.loadingGraphics = new Loading( param ); 763 // this.loadingGraphics.display(); 764 //this.loadingGraphics.hide(); 762 765 763 766 … … 899 902 } 900 903 904 //sélection du fichier binaire de deuxiÚme base geisa sélectionnée pour l'option graphique "databases comparison" 905 var paramBase2 = ""; 906 switch (this.selectDatabase2.getValue()) { 907 case 'GEISA2003': 908 paramBase2 = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+this.NomRepFileOut+" -filein2 "+this.pathProcess+"line_GEISA2003_bin_gs08_v1.0 -database_name2 GEISA2003"; 909 break; 910 case 'GEISA2011': 911 paramBase2 = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+this.NomRepFileOut+" -filein2 "+this.pathProcess+"line_GEISA2009_bin -database_name2 GEISA2011 -database_type gs08"; 912 break; 913 case 'HITRAN2009': 914 paramBase2 = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+this.NomRepFileOut+" -filein2 "+this.pathProcess+"HITRAN_2009_bin -database_name2 HITRAN2009"; 915 break; 916 } 917 901 918 902 919 //molécules … … 1072 1089 1073 1090 1074 //Sampling step 1091 //Sampling step Splitting step 1075 1092 if( $("#sampStep").val() > 0 ) 1076 1093 { … … 1097 1114 } 1098 1115 1116 //Splitting step 1099 1117 if( $("#sampStep").val() == 0 ) 1100 1118 { … … 1198 1216 1199 1217 1200 //Valeur de mean value 1218 //Valeur de mean value Bin-average 1201 1219 var meanValue = "-step "+$("#meanValue2").val(); 1202 1220 //controle des valeurs entrées par l'utilisateur … … 1233 1251 //var lineType="-line_type "+document.getElementById('selectTypePlotY1').options[document.getElementById('selectTypePlotY1').selectedIndex].value; 1234 1252 1253 // sélection du type de tracé pour la deuxiÚme base dans l'option "databases comparison" 1254 //var lineType3="-line_type3 "+this.selectTypeTraceDatabase2.getValue(); 1235 1255 1236 1256 //sélection ou non d'un 2eme choix pour l'axe des Y (pas de valeur pour ce champ si choix none ou si l'option n'est pas activée) … … 1267 1287 } 1268 1288 1289 //choix du type de sortie pour l'option graphique 'databases comparison" 1290 var diffStep=""; 1291 this.selectOutputDatabasecomparison.getValue() 1292 switch (this.selectOutputDatabasecomparison.getValue()) { 1293 case 'def': 1294 diffStep = ""; 1295 break; 1296 case 'diff_step': 1297 diffStep = "-diff_step"; 1298 break; 1299 case 'diff_step100': 1300 diffStep = "-diff_step100"; 1301 break; 1302 case 'diff_stepboth': 1303 diffStep = "-diff_stepboth"; 1304 break; 1305 } 1306 1307 //Dans l'option graphique "databases comparison", pour les sorties par différence moyenne le champ "Bin-average" doit être supérieur à 0 1308 if ($("#graphicOptionChoice").val() =="comparison" && $("#meanValue2").val() == 0 && this.selectOutputDatabasecomparison.getValue() != "def" ) 1309 { 1310 alert("For average output, the Bin-average field must be > 0"); 1311 return; 1312 } 1313 1269 1314 1270 1315 //ouverture de la div de l'image d'attente … … 1280 1325 { 1281 1326 //construction de la requête Fortran 1282 1283 1327 var parameters = "&fortranRequest="+paramBase+" "+isotopesSelectedName+" "+rangeLower+" "+rangeUpper+" "+samplingStep+" "+intensityLower+" "+intensityUpper+" "+ 1284 1328 meanValue+" "+nbCourbes+" "+field+" "+logScale+" "+lineType+" "+field2+" "+logScale2+" "+lineType2; … … 1305 1349 if ($("#graphicOptionChoice").val() =="global" ) 1306 1350 { 1307 alert("global"); 1308 } 1351 //construction de la requête Fortran 1352 1353 var parameters = "&fortranRequest="+paramBase+" "+isotopesSelectedName+" "+rangeLower+" "+rangeUpper+" "+samplingStep+" "+intensityLower+" "+intensityUpper+" "+ 1354 nbCourbes+" "+logScale+" "+lineType+" -global_position"; 1355 1356 1357 //remplacement de espace par "EEE" pour que le shell script ne voit qu'un seul argument en entrée 1358 parameters=parameters.replace(/ /g,"kkk"); 1359 1360 //pas de transition dans cette option 1361 transitionUpper ="no"; 1362 transitionLower ="no"; 1363 1364 //envoie de la requête au controller 1365 //en cas de succes appel de la fonction "handleGeisa" 1366 $.ajax( { 1367 url: "project?methodName=createUserRequest&"+parameters+"&transitionUpper="+ transitionUpper+"&transitionLower="+ transitionLower+"&nbGraph="+ this.nbGraph+"&nomFichier="+this.nomFichier+"&NomRepFileOut="+this.NomRepFileOut, 1368 success:jQuery.proxy( this.handleGeisa, this ) 1369 } ); 1370 1371 } 1372 1373 //ParamÚtres à prendre en compte pour l'option "Databases comparison" 1309 1374 1310 1375 //Submit pour l'option graphique "Databases comparison" 1311 1376 if ($("#graphicOptionChoice").val() =="comparison" ) 1312 1377 { 1313 alert("comparison"); 1378 1379 1380 //construction de la requête Fortran 1381 var parameters = "&fortranRequest="+paramBase+" "+paramBase2+" "+isotopesSelectedName+" "+rangeLower+" "+rangeUpper+" "+samplingStep+" "+intensityLower+" "+intensityUpper+" "+ 1382 meanValue+" "+nbCourbes+" "+field+" "+logScale+" "+lineType+" "+diffStep; 1383 1384 1385 //remplacement de espace par "EEE" pour que le shell script ne voit qu'un seul argument en entrée 1386 parameters=parameters.replace(/ /g,"kkk"); 1387 transitionUpper=transitionUpper.replace(/ /g,"kkk"); 1388 //le + est interprété comme un espace (plus sera retransformé en + dans le shell) 1389 transitionUpper=transitionUpper.replace(/\+/g,"plus"); 1390 transitionLower=transitionLower.replace(/ /g,"kkk"); 1391 transitionLower=transitionLower.replace(/\+/g,"plus"); 1392 1393 //envoie de la requête au controller 1394 //en cas de succes appel de la fonction "handleGeisa" 1395 $.ajax( { 1396 url: "project?methodName=createUserRequest&"+parameters+"&transitionUpper="+ transitionUpper+"&transitionLower="+ transitionLower+"&nbGraph="+ this.nbGraph+"&nomFichier="+this.nomFichier+"&NomRepFileOut="+this.NomRepFileOut, 1397 success:jQuery.proxy( this.handleGeisa, this ) 1398 } ); 1399 1314 1400 } 1315 1401 -
geisa/web/src/com/ether/Controller.java
r671 r690 223 223 public static final String PATH_IMAGES = "resources/images/graphGeisa/"; 224 224 //local 225 public static final String LONG_PATH_IMAGES = "/home_local/npipsl/workspaces/GEISA/web/resources/images/graphGeisa/";225 public static final String LONG_PATH_IMAGES = "/home_local/npipsl/workspaces/GEISA/web/resources/images/graphGeisa/"; 226 226 // naboo 227 // 227 // public static final String LONG_PATH_IMAGES = "/usr/local/apache-tomcat/webapps/geisa/resources/images/graphGeisa/"; 228 228 229 229 //local 230 public static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether/";230 public static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether/"; 231 231 //naboo 232 //public static final String PATH_PROCESS = "/home/www/GEISA/";232 //public static final String PATH_PROCESS = "/home/www/GEISA/"; 233 233 private static final String VIEW_INIT = "init"; 234 234 private static final String VIEW_INIT2 = "initGeisa";
Note: See TracChangeset
for help on using the changeset viewer.