Changeset 537
- Timestamp:
- 07/26/12 18:44:12 (12 years ago)
- Location:
- geisa/web
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
geisa/web/initGeisa.jsp
r536 r537 32 32 <div id="titlePage" class="titlePage"></div><br> 33 33 34 This tool is to draw spectroscopic parameter in fonction of wave number.34 This tool is to draw spectroscopic parameters in fonction of wave number. 35 35 Please select the differents parameters to draw your own graph. 36 36 -
geisa/web/initGeisa_script.jsp
r536 r537 507 507 var inputSpectralRangeUpper = $( document.createElement( "input" ) ); 508 508 inputSpectralRangeUpper.attr( {id:"RangeUpper"} ); 509 inputSpectralRangeUpper.val( 800);509 inputSpectralRangeUpper.val(35877.030506); 510 510 //pour mettre à jour le menu déroulant des transitions 511 511 inputSpectralRangeUpper.bind( 'blur', this, jQuery.proxy( this.requestTransition, this )); … … 547 547 var inputIntensityUpper = $( document.createElement( "input" ) ); 548 548 inputIntensityUpper.attr( {id:"intensityUp"} ); 549 inputIntensityUpper.val(1e-1 9);549 inputIntensityUpper.val(1e-16); 550 550 this.containerFormIntensityUpper.append( inputIntensityUpper ); 551 551 … … 836 836 837 837 838 //averti rl'utilisateur qu'il faut au moins sélectionner un isotope838 //averti l'utilisateur qu'il faut au moins sélectionner un isotope 839 839 if (this.nbIsotopes == 0) { 840 840 alert("Error : no molecule or isotopoloque was selected"); … … 897 897 898 898 899 900 //controle des valeurs entrées par l'utilisateur 901 //Spectral range 902 //isNaN = n'est pas un nombre 903 if(isNaN($("#RangeLower").val()) == true || $("#RangeLower").val() < 0 ) 904 { 905 alert("Error: Invalid value for lower spectral range area"); 906 return; 907 } 908 909 if(isNaN($("#RangeUpper").val()) == true || $("#RangeUpper").val() < 0 || $("#RangeUpper").val() > 35877.030506) 910 { 911 alert("Error: Invalid value for upper spectral range area"); 912 return; 913 } 914 915 916 if( $("#RangeLower").val() > $("#RangeUpper").val() ) 917 918 { 919 alert("Error: lower spectral range area is superior to upper spectral range area "); 920 return; 921 } 922 923 //Intensity range 924 if(isNaN($("#intensityLo").val()) == true || $("#intensityLo").val() < 0 ) 925 { 926 alert("Error: Invalid value for lower intensity range area"); 927 return; 928 } 929 930 931 if(isNaN($("#intensityUp").val()) == true || $("#intensityUp").val() < 0 ) 932 { 933 alert("Error: Invalid value for upper intensity range area"); 934 return; 935 } 936 937 //to do javascript ne sait comparer des exponenciels 938 // if( $("#intensityLo").val() > $("#intensityUp").val() ) 939 940 // { 941 // alert("Error: lower intensity range area is superior to upper intensity range area "); 942 // return; 943 // } 944 899 945 //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) 900 946 if (this.selectTraceAxeY2.getValue() == 'no' || this.selectTraceAxeY2.isDisable == true) … … 928 974 } 929 975 930 //Valeur de mean value (a faire test sur la valeur à ne prendre que si val >=0 sinon afficher message)976 //Valeur de mean value 931 977 var meanValue = "EEE-stepEEE"+$("#meanValue2").val(); 932 933 978 //Si ce n'est pas un nombre ou si il est négatif 979 if(isNaN($("#meanValue2").val()) == true || $("#meanValue2").val() < 0 ) 980 { 981 alert("Error: Invalid value for Average calculation area"); 982 return; 983 } 984 985 //on va chercher les chemin déclaré dans le controller 986 this.pathProcess = "<%=Controller.PATH_PROCESS%>"; 987 this.LongPathImages = "<%=Controller.LONG_PATH_IMAGES%>"; 934 988 935 989 //sélection du fichier binaire de la base geisa sélectionnée … … 937 991 switch (this.selectDatabase.getValue()) { 938 992 case 'GEISA2003': 939 paramBase = "EEE-fileinEEEline_GEISAIASI2011_bin_gsi08_v1.0EEE-database_nameEEEGEISAIASI09EEE-database_typeEEEgsi08"; 993 //paramBase = "EEE-fileinEEE"+this.pathProcess+"line_GEISA2003_asc_gs03_v1.0EEE-input_formatEEEascEEE-database_nameEEEGEISA2003EEE-database_typeEEEgs03-diroutEEE"+this.LongPathImages; 994 paramBase = "EEE-fileinEEE"+this.pathProcess+"line_GEISA2003_asc_gs03_v1.0EEE-input_formatEEEascEEE-database_nameEEEGEISA2003EEE-database_typeEEEgs03"; 940 995 break; 941 996 case 'GEISA2011': 942 paramBase = "EEE-fileinEEEline_GEISA2009_binEEE-database_nameEEEGEISA2011EEE-database_typeEEEgs08"; 997 //paramBase = "EEE-fileinEEE"+this.pathProcess+"line_GEISA2009_binEEE-database_nameEEEGEISA2011EEE-database_typeEEEgs08EEE-diroutEEE"+this.LongPathImages; 998 paramBase = "EEE-fileinEEE"+this.pathProcess+"line_GEISA2009_binEEE-database_nameEEEGEISA2011EEE-database_typeEEEgs08"; 999 943 1000 break; 944 1001 case 'GEISAIASI2003': 945 paramBase = "EEE-fileinEEEline_GEISAIASI2003_bin_gsi08_v1.0EEE-database_nameEEEGEISAIASI09EEE-database_typeEEEgsi08"; 1002 //paramBase = "EEE-fileinEEE"+this.pathProcess+"line_GEISAIASI2003_asc_gsi03_v1.0EEE-input_formatEEEascEEE-database_nameEEEGEISAIASI2003EEE-database_typeEEEgsi03-diroutEEE"+this.LongPathImages; 1003 paramBase = "EEE-fileinEEE"+this.pathProcess+"line_GEISAIASI2003_asc_gsi03_v1.0EEE-input_formatEEEascEEE-database_nameEEEGEISAIASI2003EEE-database_typeEEEgsi03"; 946 1004 break; 947 1005 case 'GEISAIASI2011': 948 paramBase = "EEE-fileinEEEline_GEISAIASI2011_bin_gsi08_v1.0EEE-database_nameEEEGEISAIASI09EEE-database_typeEEEgsi08"; 1006 //paramBase = "EEE-fileinEEE"+this.pathProcess+"line_GEISAIASI2011_bin_gsi08_v1.0EEE-database_nameEEEGEISAIASI2011EEE-database_typeEEEgsi08-diroutEEE"+this.LongPathImages; 1007 paramBase = "EEE-fileinEEE"+this.pathProcess+"line_GEISAIASI2011_bin_gsi08_v1.0EEE-database_nameEEEGEISAIASI2011EEE-database_typeEEEgsi08"; 949 1008 break; 950 1009 } … … 998 1057 999 1058 } 1000 1059 //alert ("nbMolecules"+nbMolecules); 1001 1060 //si le nombre de molécule sélectionnées est supérieure à 1 les menus des transition sont inactifs 1002 // if (nbMolecules != 1) 1003 // { 1004 // 1005 // this.selectTransitionLower.disable(); 1006 // this.selectTransitionUpper.disable(); 1007 // document.getElementById("transitionUpperTitle").className = "notActiveText"; 1008 // document.getElementById("transitionLowerTitle").className = "notActiveText"; 1009 // } 1010 // else 1011 // { 1012 // this.selectTransitionLower.enable(); 1013 // this.selectTransitionUpper.enable(); 1014 // document.getElementById("transitionUpperTitle").className = "transitionUpperTitle"; 1015 // document.getElementById("transitionLowerTitle").className = "transitionLowerTitle"; 1016 // } 1017 // 1018 // alert("isotopesSelectedName"+isotopesSelectedName); 1019 //On ne fait appel à la BDD des transitions que si au moins un isotope est sélectionné et si au plus 1 molécule est sélectionnée 1020 //if ((isotopesSelectedName) && (nbMolecules = 1 )) 1021 //{ 1061 if (nbMolecules > 1) 1062 { 1063 1064 this.selectTransitionLower.disable(); 1065 this.selectTransitionUpper.disable(); 1066 //ajoute une classe à celle déjà existante de transitionUpperTitle 1067 $("#transitionUpperTitle").addClass("notActiveText"); 1068 $("#transitionLowerTitle").addClass("notActiveText"); 1069 } 1070 else 1071 { 1072 this.selectTransitionLower.enable(); 1073 this.selectTransitionUpper.enable(); 1074 $("#transitionUpperTitle").removeClass("notActiveText"); 1075 $("#transitionLowerTitle").removeClass("notActiveText"); 1076 } 1077 1078 1079 //On ne fait appel à la BDD des transitions et si au plus 1 molécule est sélectionnée 1080 if (nbMolecules == 1 ) 1081 { 1022 1082 // $.ajax( { 1023 1083 // url: "project?methodName=getTransitionByIsotopeName&isotopesSelectedName="+isotopesSelectedName+"&GeisaSelectedDatabase="+GeisaSelectedDatabase+"&spectralRangeLower="+spectralRangeLower+"&spectralRangeUpper="+spectralRangeUpper, … … 1030 1090 } ); 1031 1091 1032 // } 1092 } 1093 else 1094 { 1095 //pour réinitialiser le menu déroulant si aucune ou plusieurs molécules sont sélectionnées 1096 this.selectTransitionLower.clear(); 1097 this.selectTransitionUpper.clear(); 1098 this.selectTransitionLower.add('transition', "Select a molecule"); 1099 this.selectTransitionUpper.add('transition', "Select a molecule"); 1100 //pour forcer à afficher le premier élément (et non le premier élément précédent) 1101 this.selectTransitionLower.selectFirst(); 1102 this.selectTransitionUpper.selectFirst(); 1103 } 1033 1104 }, 1034 1105 … … 1134 1205 this.selectTransitionUpper.selectFirst(); 1135 1206 1136 alert ("transitionsUpper"+transitionsUpper);1207 //alert ("transitionsUpper"+transitionsUpper); 1137 1208 $.each(transitionsLower, jQuery.proxy( function(index, transitionsLower ) 1138 1209 { … … 1178 1249 //this.selectTransitionUpper.add(transitions.codeQuantUpper, transitions.codeQuantUpper); 1179 1250 // this.selectTransitionUpper.add("111", "111" ); 1180 this.selectTransitionLower.add(transitions.codeQuantLower, transitions.codeQuantLower);1251 this.selectTransitionLower.add(transitions.codeQuantLower, transitions.codeQuantLower); 1181 1252 this.selectTransitionUpper.add(transitions.codeQuantUpper, transitions.codeQuantUpper); 1182 1253 }, this)); -
geisa/web/src/com/ether/Controller.java
r536 r537 72 72 //Pour lancer le programme fortran 73 73 // Process p = Runtime.getRuntime().exec("/home/npipsl/Desktop/geisa-Graphique/prog-ether/graph.sh " + fortranRequest + " " + timeInMillis + ""); 74 Process p = Runtime.getRuntime().exec(PATH_PROCESS+File.separatorChar+"graph.sh " + fortranRequest + " " + timeInMillis + ""); 74 // Process p = Runtime.getRuntime().exec(PATH_PROCESS+File.separatorChar+"graph.sh " + fortranRequest + " " + timeInMillis + ""); 75 Process p = Runtime.getRuntime().exec(PATH_PROCESS+"graph.sh " + fortranRequest + " " + timeInMillis + ""); 75 76 // Process p = Runtime.getRuntime().exec("/home/www/GEISA/graph.sh " + fortranRequest + " " + timeInMillis + ""); 76 77 77 78 final String lastFileName = "graph" + timeInMillis +"-"+nbGraph+ ".png"; 78 final File lastFile = new java.io.File(LONG_PATH_IMAGES+File.separatorChar+lastFileName); 79 final Integer maxTimeWait = 60000; 79 //final File lastFile = new java.io.File(LONG_PATH_IMAGES+File.separatorChar+lastFileName); 80 final File lastFile = new java.io.File(LONG_PATH_IMAGES+lastFileName); 81 final Integer maxTimeWait = 65000; 80 82 81 83 … … 201 203 202 204 public static final String PATH_IMAGES = "resources/images/graphGeisa/"; 203 public static final String LONG_PATH_IMAGES = "/home_local/npipsl/workspaces/GEISA/web/resources/images/graphGeisa ";204 p rivate static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether";205 public static final String LONG_PATH_IMAGES = "/home_local/npipsl/workspaces/GEISA/web/resources/images/graphGeisa/"; 206 public static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether/"; 205 207 private static final String VIEW_INIT = "init"; 206 208 private static final String VIEW_INIT2 = "initGeisa";
Note: See TracChangeset
for help on using the changeset viewer.