Changeset 674
- Timestamp:
- 11/30/12 15:18:18 (11 years ago)
- Location:
- geisa
- Files:
-
- 2 added
- 5 edited
- 1 copied
-
.idea/libraries/lib.xml (modified) (1 diff)
-
persistence/implementation/com/ether/dao/IsotopeG03DAOImpl.java (modified) (1 diff)
-
persistence/implementation/hibernate.cfg.xml (modified) (1 diff)
-
web/WEB-INF/lib/c3p0-0.9.1.jar (added)
-
web/WEB-INF/lib/hibernate-c3p0-4.1.7.Final.jar (added)
-
web/initGeisa.jsp (modified) (1 diff)
-
web/initGeisa_script.jsp (modified) (39 diffs)
-
web/initGeisa_script_OLD.jsp (copied) (copied from geisa/web/initGeisa_script.jsp) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
geisa/.idea/libraries/lib.xml
r615 r674 57 57 <root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/mysql-connector-java-5.1.21-bin.jar!/" /> 58 58 <root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/hibernate-c3p0-4.1.7.Final.jar!/" /> 59 <root url="jar://$PROJECT_DIR$/web/WEB-INF/lib/c3p0-0.9.1.jar!/" /> 59 60 </CLASSES> 60 61 <JAVADOC /> -
geisa/persistence/implementation/com/ether/dao/IsotopeG03DAOImpl.java
r553 r674 15 15 import java.util.List; 16 16 import java.util.Set; 17 17 18 18 19 /** -
geisa/persistence/implementation/hibernate.cfg.xml
r671 r674 20 20 <!--<prop key="hibernate.connection.username">postgres</prop>--> 21 21 <!--<prop key="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</prop>--> 22 <!--<prop key="hibernate.generate_statistics">true</prop>--> 23 <!--<prop key="hibernate.connection.url">jdbc:mysql://localhost/geisa?autoReconnect=true</prop>--> 24 25 26 <!--<prop key="hibernate.connection.driver_class">com.mysql.jdbc.Driver</prop> 27 <prop key="hibernate.connection.url">jdbc:mysql://localhost/geisa</prop> --> 28 <!-- en local--> 29 <!-- <prop key="hibernate.connection.username">root</prop>--> 30 <!-- sur naboo --> 31 <!--<prop key="hibernate.connection.username">geisa</prop>--> 32 <!-- <prop key="hibernate.connection.password">geisa11</prop> 33 <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop> 34 <prop key="hibernate.show_sql">true</prop> --> 35 36 37 <!-- configuration pool via c3p0--> 38 <prop key="hibernate.connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</prop> 22 39 <prop key="hibernate.connection.driver_class">com.mysql.jdbc.Driver</prop> 23 < !--<prop key="hibernate.connection.url">jdbc:mysql://localhost/geisa?autoReconnect=true</prop>-->24 <prop key="hibernate.connection.url">jdbc:mysql://localhost/geisa</prop> 40 <prop key="hibernate.connection.url">jdbc:mysql://localhost/geisa</prop> 41 25 42 <!-- en local--> 26 43 <prop key="hibernate.connection.username">root</prop> 27 44 <!-- sur naboo --> 28 <!--<prop key="hibernate.connection.username">geisa</prop>-->45 <!--<prop key="hibernate.connection.username">geisa</prop>--> 29 46 <prop key="hibernate.connection.password">geisa11</prop> 30 47 <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop> 31 48 <prop key="hibernate.show_sql">true</prop> 32 <!--<prop key="hibernate.generate_statistics">true</prop>--> 49 <prop key="hibernate.c3p0.acquire_increment">1</prop><!-- Determines how many connections at a time c3p0 will try to acquire when the pool is exhausted--> 50 <prop key="hibernate.c3p0.idle_test_period">100</prop> <!--seconds =idle time in seconds before a connection is automatically validated--> 51 <prop key="hibernate.c3p0.max_size">100</prop> <!--Taille maximale du pool--> 52 <prop key="hibernate.c3p0.min_size">10</prop> <!--Taille minimale du pool --> 53 <prop key="hibernate.c3p0.timeout">0</prop><!-- seconds / 0 never expire--> 54 <prop key="hibernate.c3p0.max_statements">0</prop><!-- Taille du cache de statements de C3P0. 0 = désactive le cache --> 33 55 34 <!-- configuration pool via c3p0-->35 36 37 <!-- <prop key="hibernate.c3p0.acquire_increment">1</prop>38 <prop key="hibernate.c3p0.idle_test_period">100</prop> seconds -->39 <!-- <prop key="hibernate.c3p0.max_size">100</prop> Taille maximale du pool -->40 <!-- <prop key="hibernate.c3p0.min_size">10</prop> Taille minimale du pool -->41 <!-- <prop key="hibernate.c3p0.timeout">0</prop> seconds / 0 =jamais-->42 <!-- <prop key="hibernate.c3p0.max_statements">0</prop> Taille du cache de statements de C3P0. 0 = désactive le cache -->43 <!-- <prop key="connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</prop>-->44 56 45 57 </props> 46 58 </property> 59 47 60 </bean> 61 48 62 49 63 <bean id="transactionManager" -
geisa/web/initGeisa.jsp
r671 r674 166 166 167 167 <script type="text/javascript"> 168 //tester le navigateur 169 var ua = navigator.userAgent, 170 index, 171 navigateur, 172 version; 173 //dans le cas d'internet explorer 174 if((index = ua.indexOf('MSIE'))>=0) { 175 version = ua.match(/MSIE ([0-9]+(?:\.[0-9]+)*)/)[1]; 176 var premierCaractere = version.charAt(0); 177 } 178 // Pour les versions d'Internet Explorer < 9 l'interface ne fonctionne pas 179 if ( premierCaractere < 9 ) 180 { 181 alert("this tool does not work for Internet Explorer versions less than 9. You can use Internet Explorer from version 9 or other browser like firefox, google chrome"); 182 } 183 184 185 186 168 187 var initTexts = $A( "" ); 169 188 -
geisa/web/initGeisa_script.jsp
r671 r674 9 9 10 10 11 //permet de deselectionner la molecule quand on deselectionne un isotope (toutes les options sauf lst)12 /*function decliquemol( name )13 {14 15 var inputs = document.getElementsByTagName( 'input' );16 var count = inputs.length;17 for( i = 0; i < count; i++ )18 {19 input = inputs.item( i );20 if( input.type == 'checkbox' && input.id == (name + '-all') && input.checked == true )21 {22 input.checked = false;23 }24 }25 } */26 27 28 11 var InterfaceInit = Class.create( { 29 12 30 13 initialize: function() 31 14 { 15 32 16 /** *********** CONTAINERS *********** **/ 33 17 this.containerFormSpectralRangeLower = $( "#spectralRangeLower" ); … … 516 500 517 501 //Titre 518 //var titleSpectralRangeLower = document.createTextNode("Upper Bound :");519 // document.getElementById("spectralRangeLower").appendChild(titleSpectralRangeLower);520 502 document.getElementById("spectralRangeLower").innerHTML = "Lower value, cm<sup>-1</sup> : "; 521 //var titleSpectralRangeUpper = document.createTextNode("Upper Bound :");522 // document.getElementById("spectralRangeUpper").appendChild(titleSpectralRangeUpper);523 503 document.getElementById("spectralRangeUpper").innerHTML = "Upper value, cm<sup>-1</sup> : "; 524 504 document.getElementById("samplingStep").innerHTML = "<br>Sampling step : "; … … 526 506 var inputSpectralRangeLower = $( document.createElement( "input" ) ); 527 507 inputSpectralRangeLower.attr( {id:"rangeLower", class:"styleInputs"} ); 528 inputSpectralRangeLower.val(0);529 508 //pour mettre à jour le menu déroulant des transitions 530 509 inputSpectralRangeLower.bind( 'blur', this, jQuery.proxy( this.requestTransition, this )); … … 533 512 var inputSpectralRangeUpper = $( document.createElement( "input" ) ); 534 513 inputSpectralRangeUpper.attr( {id:"rangeUpper"} ); 535 inputSpectralRangeUpper.val(35877.030506);536 514 //pour mettre à jour le menu déroulant des transitions lorsque l'on change la valeur du spectral range 537 515 inputSpectralRangeUpper.bind( 'blur', this, jQuery.proxy( this.requestTransition, this )); … … 544 522 //Zone texte Intensity 545 523 //Titre 546 //var titleIntensityLower = document.createTextNode("Lower Bound :");547 //document.getElementById("intensityLower").appendChild(titleIntensityLower);548 //var titleIntensityUpper = document.createTextNode("Upper Bound :");549 //document.getElementById("intensityUpper").appendChild(titleIntensityUpper);550 524 document.getElementById("intensityLower").innerHTML = "Lower value, cm/mol. : " 551 525 document.getElementById("intensityUpper").innerHTML = "Upper value, cm/mol. : " 552 553 526 //zone texte IntensityLower 554 527 var inputIntensityLower = $( document.createElement( "input" ) ); … … 582 555 this.selectTraceAxeY1.add( 'R', "Temperature of the air pressure shift ", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 583 556 this.selectTraceAxeY1.selectFirst( false ); 584 // this.selectTraceAxeY1 = $( document.createElement( "select" ) );585 // this.selectTraceAxeY1.attr( {id:"selectAxeY1" } );586 //this.selectTraceAxeY1.css("width", "100px");587 // this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"B", text:"Intensity"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "B" ])));588 // this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"C", text:"Air broadening pressure halfwidth"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "C" ])));589 // this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"D", text:"Energy of the lower transition level"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "D" ])));590 // this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"F", text:"Temperature of the air broadening halfwidth"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "F" ])));591 // this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"N", text:"Self broadening pressure halfwidth (HWHM)"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "N" ])));592 // this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"O", text:"Air pressure shift of the line transition"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "O" ])));593 // this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"R", text:"Temperature of the air pressure shift"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "R" ])));594 // $("#axeY1").append(this.selectTraceAxeY1);595 596 597 557 598 558 // Create menu deroulant type de graphe … … 613 573 this.selectNbCourbes.add( 'ci', "Separated isotopologues : same graph", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 614 574 this.selectNbCourbes.selectFirst( false ); 615 // this.selectNbCourbes = $( document.createElement( "select" ) );616 //this.selectNbCourbes.attr( {id:"selectNbCourbes"} );617 // this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"ca", text:"One curve for all selection"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "ca" ])));618 //this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"cm", text:"One curve for each molecule selected"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "cm" ])));619 //this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"ci", text:"One curve for each isotopologue selected"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "ci" ])));620 // this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"gm", text:"One graph for each molecule selected"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "gm" ])));621 //this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"gi", text:"One graph for each isotopologue selected"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "gi" ])));622 //$("#nbCourbes").append(this.selectNbCourbes);623 624 575 625 576 // Create menu deroulant type d'échelle linéaire ou logarithmique pour le choix y1 … … 635 586 this.selectScaleY1.add( '-log_scale', "Logarithmic" ); 636 587 this.selectScaleY1.selectFirst( false ); 637 //this.selectScaleY1 = $( document.createElement( "select" ) );638 // this.selectScaleY1.attr( {id:"selectScaleY1"} );639 // var optSelectScaleY1 = $( document.createElement( "option" ) );640 // optSelectScaleY1.attr( {value:"l", text:"Linear"} );641 // this.selectScaleY1.append(optSelectScaleY1);642 // var optSelectScaleY1 = $( document.createElement( "option" ) );643 //optSelectScaleY1.attr( {value:"-log_scale", text:"Logarithmic"} );644 // this.selectScaleY1.append(optSelectScaleY1);645 // $("#scaleY1").append(this.selectScaleY1);646 588 647 589 … … 662 604 this.selectTypeTraceY1.add( 'lp', "Lines and Dots" ); 663 605 this.selectTypeTraceY1.selectFirst( false ); 664 //this.selectTypeTraceY1 = $( document.createElement( "select" ) );665 //this.selectTypeTraceY1.attr( {id:"selectTypePlotY1"} );666 //this.selectTypeTraceY1.append($( document.createElement( "option" ) ).attr( {value:"l", text:"Lines"} ));667 //this.selectTypeTraceY1.append($( document.createElement( "option" ) ).attr( {value:"p", text:"Dots"} ));668 //this.selectTypeTraceY1.append($( document.createElement( "option" ) ).attr( {value:"i", text:"Peaks"} ));669 //this.selectTypeTraceY1.append($( document.createElement( "option" ) ).attr( {value:"lp", text:"Lines and Dots"} ));670 //$("#typePlotY1").append(this.selectTypeTraceY1);671 672 673 606 674 607 … … 684 617 var titleTransitionUpper = document.createTextNode("Upper state : "); 685 618 document.getElementById("transitionUpper").appendChild(titleTransitionUpper); 686 687 688 // Create menu deroulant transition upper 689 // var paramSelectTransitionUpper = new Object(); 690 // paramSelectTransitionUpper.id = "transition1"; 691 // paramSelectTransitionUpper.parent = $("#transitionUpper"); 692 // this.selectTransitionUpper = new Select( paramSelectTransitionUpper ); 693 // this.selectTransitionUpper.add( '-1', "Select a molecule" ); 694 // this.selectTransitionUpper.selectFirst( false ); 695 619 //titre menu deroulant transition upper 696 620 this.selectTransitionUpper = $( document.createElement( "select" ) ); 697 621 this.selectTransitionUpper.attr( {id:"transition1"} ); … … 700 624 var optTransitionUpper = $( document.createElement( "option" ) ); 701 625 optTransitionUpper.attr( {value:"-1", text:"Select a molecule"} ); 702 //var transitionsLower ="000";703 // opt2.bind( 'click', jQuery.proxy(this.requestTransitionByTransitionLower, [this, transitionsLower ]));704 626 this.selectTransitionUpper.append(optTransitionUpper); 705 627 $("#transitionUpper").append(this.selectTransitionUpper); … … 709 631 var titleTransitionLower = document.createTextNode("Lower state : "); 710 632 document.getElementById("transitionLower").appendChild(titleTransitionLower); 711 712 633 // Create menu deroulant transition lower 713 // var paramSelectTransitionLower = new Object();714 // paramSelectTransitionLower.id = "transition2";715 // paramSelectTransitionLower.parent = $("#transitionLower");716 // this.selectTransitionLower = new Select( paramSelectTransitionLower );717 // this.selectTransitionLower.add( '-1', "Select a molecule");718 // this.selectTransitionLower.selectFirst( false );719 634 this.selectTransitionLower = $( document.createElement( "select" ) ); 720 635 this.selectTransitionLower.attr( {id:"transition2"} ); … … 727 642 //bouton reset pour les transition 728 643 var resetButton = new Button( {value:"Reset", parent:$( "#transitionReset" ), id:"buttonReset", className: "gray_button", onClick:jQuery.proxy( this.requestTransition, this )} ); 729 730 731 // //menu déroulant js en javascript sans passer par le modele732 // var select = document.createElement('select');733 // select.id = "transiEssai";734 // select.name ="transiEssai";735 //736 // var opt = document.createElement('option');737 // opt.setAttribute('value','id1');738 // var theText = document.createTextNode("id1");739 // opt.appendChild(theText);740 // select.appendChild(opt);741 //742 // var opt = document.createElement('option');743 // opt.setAttribute('value','id2');744 // var theText = document.createTextNode("id2");745 // opt.appendChild(theText);746 //747 // //opt.onclick=jQuery.proxy(this.requestTransitionByTransitionLower, [this, transitionsLower ]);748 // select.appendChild(opt);749 // document.getElementById("transitionLower").appendChild(select);750 751 752 //menu déroulant en jquery sans passer par le modele753 // this.select2 = $( document.createElement( "select" ) );754 // this.select2.attr( {id:"transiEssai2", name:"transiEssai2"} );755 // var opt2 = $( document.createElement( "option" ) );756 // opt2.attr( {value:"id3", text:"zzz"} );757 // //var transitionsLower ="000";758 // // opt2.bind( 'click', jQuery.proxy(this.requestTransitionByTransitionLower, [this, transitionsLower ]));759 // this.select2.append(opt2);760 // $("#transitionLower").append(this.select2);761 762 763 644 764 645 … … 793 674 this.selectTraceAxeY2.add( 'R', "Temperature of the air pressure shift ", jQuery.proxy(this.onClickSelectTraceAxeY2, this ) ); 794 675 this.selectTraceAxeY2.selectFirst( false ); 795 //this.selectTraceAxeY2 = $( document.createElement( "select" ) );796 //this.selectTraceAxeY2.attr( {id:"selectAxeY2"} );797 //this.selectTraceAxeY2.append($( document.createElement( "option" ) ).attr( {value:"no", text:"None"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY2, [this, "no" ])));798 //this.selectTraceAxeY2.append($( document.createElement( "option" ) ).attr( {value:"B", text:"Intensity"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY2, [this, "B" ])));799 //this.selectTraceAxeY2.append($( document.createElement( "option" ) ).attr( {value:"C", text:"Air broadening pressure halfwidth"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY2, [this, "C" ])));800 //this.selectTraceAxeY2.append($( document.createElement( "option" ) ).attr( {value:"D", text:"Energy of the lower transition level"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY2, [this, "D" ])));801 //this.selectTraceAxeY2.append($( document.createElement( "option" ) ).attr( {value:"F", text:"Temperature of the air broadening halfwidth"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY2, [this, "F" ])));802 //this.selectTraceAxeY2.append($( document.createElement( "option" ) ).attr( {value:"N", text:"Self broadening pressure halfwidth (HWHM)"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY2, [this, "N" ])));803 //this.selectTraceAxeY2.append($( document.createElement( "option" ) ).attr( {value:"O", text:"Air pressure shift of the line transition"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY2, [this, "O" ])));804 //this.selectTraceAxeY2.append($( document.createElement( "option" ) ).attr( {value:"R", text:"Temperature of the air pressure shift"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY2, [this, "R" ])));805 //$("#axeY2").append(this.selectTraceAxeY2);806 676 807 677 … … 821 691 document.getElementById("scaleY2Titre").className = "notActiveText"; 822 692 this.selectScaleY2.disable(); 823 824 825 //this.selectScaleY2 = $( document.createElement( "select" ) );826 //this.selectScaleY2.attr( {id:"selectScaleY2"} );827 //var optSelectScaleY2 = $( document.createElement( "option" ) );828 //optSelectScaleY2.attr( {value:"l", text:"Linear"} );829 // this.selectScaleY2.append(optSelectScaleY2);830 // var optSelectScaleY2 = $( document.createElement( "option" ) );831 // optSelectScaleY2.attr( {value:"-log_scale2", text:"Logarithmic"} );832 //this.selectScaleY2.append(optSelectScaleY2);833 //$("#scaleY2").append(this.selectScaleY2);834 //est inactif par defaut car selectTraceAxeY2 est positionne a none par defaut835 //document.getElementById("scaleY2Titre").className = "notActiveText";836 //document.getElementById("selectScaleY2" ).disabled=true;837 693 838 694 … … 854 710 document.getElementById("typePlotY2Titre").className = "notActiveText"; 855 711 this.selectTypeTraceY2.disable(); 856 //this.selectTypeTraceY2 = $( document.createElement( "select" ) );857 //this.selectTypeTraceY2.attr( {id:"selectTypePlotY2"} );858 //this.selectTypeTraceY2.append($( document.createElement( "option" ) ).attr( {value:"l", text:"Lines"} ));859 //this.selectTypeTraceY2.append($( document.createElement( "option" ) ).attr( {value:"p", text:"Dots"} ));860 //this.selectTypeTraceY2.append($( document.createElement( "option" ) ).attr( {value:"i", text:"Peaks"} ));861 //this.selectTypeTraceY2.append($( document.createElement( "option" ) ).attr( {value:"lp", text:"Lines and Dots"} ));862 //$("#typePlotY2").append(this.selectTypeTraceY2);863 //est inactif par defaut car selectTraceAxeY2 est positionne a none par defaut864 // document.getElementById("typePlotY2Titre").className = "notActiveText";865 // document.getElementById("selectTypePlotY2" ).disabled=true;866 867 712 868 713 … … 882 727 883 728 884 //this.resetEssai = $( document.createElement( "input" ) ); 885 //this.resetEssai.attr( {type:"reset", name:"reset"} ); 886 //$("#boutonSubmit").append(this.resetEssai); 729 887 730 }, 888 731 … … 901 744 var table = $(document.createElement("table")); 902 745 container.append(table); 903 // var tr = $(document.createElement("tr")); 904 // tr.attr({valign: "top"}); 905 // table.append(tr); 746 906 747 var i=0; 907 748 //nombre de molecules par ligne … … 909 750 //taille du tableau 910 751 //alert("l" +moleculesArray.length); 911 // parseInt : partie entiÚre 912 // var res = parseInt(8/3); 913 //alert("res="+res); 752 914 753 915 754 $.each(moleculesArray, jQuery.proxy( function(index, moleculeElement ) … … 996 835 { 997 836 //temps en ms pour obtenir un nom unique de répertoire 998 //this.dateTime = new Date().getTime();999 837 var dateTime = new Date().getTime(); 1000 838 this.NomRepFileOut = "graph"+dateTime+"/"; 1001 839 1002 // var verification = this.verifyBob(); 1003 // if(verification) 840 1004 841 // appel ajax 1005 842 … … 1236 1073 //exemple de requete avec transition 1237 1074 //./all -filein line_GEISA2009_bin -moleisot h2o:161 -wavenb_min 1 -wavenb_max 1000 -database_name "GEISA2011" -vib_ident_lower '[000]' 1238 //var TransitionUpper ="-vib_ident_upper '[ "+this.selectTransitionUpper.getValue()+" ]'";1239 1075 var transitionUpper=document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value; 1240 //Enlever les espaces blancs 1241 // TransitionUp= TransitionUp.replace(/ /g,""); 1242 //var TransitionUpper ="-vib_ident_upper ["+TransitionUp+"]"; 1243 // var transitionUpper = "["+transitionUp+"]"; 1244 // alert ("transitionUpper"+transitionUpper); 1076 1245 1077 //certaine transitions ont plusieurs espaces à droite qui ne sont pas conservés (ex ch4 et C2HD) 1246 1078 //si la longueur de la chaine de caracteres n'est pas 25 on rajoute le nobre d'espace nécessaire pour arriver à 25 … … 1254 1086 } 1255 1087 1256 //alert("transitionUpper.length"+transitionUpper.length); 1257 //transitionUpper=transitionUpper+" "; 1258 //alert("transitionUpper.length"+transitionUpper.length); 1259 1260 // var TransitionLower ="-vib_ident_lower '[ "+this.selectTransitionLower.getValue()+" ]'"; 1088 1261 1089 var transitionLower=document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value; 1262 // TransitionLo= TransitionLo.replace(/ /g,"");1263 // var TransitionLower ="-vib_ident_lower ["+TransitionLo+"]";1264 //var transitionLower ="["+transitionLo+"]";1265 1090 1266 1091 //certaine transitions ont plusieurs espaces à droite qui ne sont pas conservés (ex ch4 et C2HD) 1267 1092 //si la longueur de la chaine de caracteres n'est pas 25 on rajoute le nobre d'espace nécessaire pour arriver à 25 1268 1093 var nb=0; 1269 nb=25-transition Upper.length1094 nb=25-transitionLower.length 1270 1095 if (nb != 0) 1271 1096 { 1272 1097 for (i = 1; i <= nb; i++) { 1273 transition Upper=transitionUpper+" ";1098 transitionLower=transitionLower+" "; 1274 1099 } 1275 1100 } 1276 1101 1277 1102 //pas de transition sélectionnée 1278 // if (( this.selectTransitionUpper.getValue()== -1) || (this.selectTransitionUpper.getValue() == "transition" )) 1279 // { 1280 // TransitionUpper =""; 1281 // } 1282 // if (( this.selectTransitionLower.getValue()== -1) || (this.selectTransitionLower.getValue() == "transition" )) 1283 // { 1284 // TransitionLower =""; 1285 // } 1103 1286 1104 if (( document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value == -1) || (document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value == "transition" )) 1287 1105 { … … 1305 1123 var sel = document.getElementById('transition1'); 1306 1124 var idupper = sel.options[sel.selectedIndex].value; 1307 //alert("idupper"+idupper);1308 1125 1309 1126 //Intensity range … … 1357 1174 //sélection du premier choix pour l'axe des Y 1358 1175 var field="-field "+this.selectTraceAxeY1.getValue(); 1359 // var field="-field "+document.getElementById('selectAxeY1').options[document.getElementById('selectAxeY1').selectedIndex].value;1360 1361 1362 1176 1363 1177 … … 1371 1185 var logScale = "" 1372 1186 } 1373 // if (document.getElementById('selectScaleY1').options[document.getElementById('selectScaleY1').selectedIndex].value == '-log_scale' && document.getElementById("selectScaleY1" ).disabled == false) 1374 // { 1375 // var logScale = document.getElementById('selectScaleY1').options[document.getElementById('selectScaleY1').selectedIndex].value; 1376 //} 1377 //else 1378 // { 1379 // var logScale = "" 1380 // } 1187 1381 1188 1382 1189 … … 1388 1195 //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) 1389 1196 if (this.selectTraceAxeY2.getValue() == 'no' || this.selectTraceAxeY2.isDisable == true) 1390 //if (document.getElementById('selectAxeY2').options[document.getElementById('selectAxeY2').selectedIndex].value == 'no' || document.getElementById("selectAxeY2" ).disabled == true)1391 1197 { 1392 1198 var field2 = ""; … … 1400 1206 //sélection du type d'échelle pour le parametre Y2 (il y a une valeur pour ce champ que si logaritmic est choisi et si l'option est activée) 1401 1207 if (this.selectScaleY2.getValue() == '-log_scale2' && this.selectScaleY2.isDisable == false) 1402 // if (document.getElementById('selectScaleY2').options[document.getElementById('selectScaleY2').selectedIndex].value == '-log_scale2' && document.getElementById("selectScaleY2" ).disabled == false)1403 1208 { 1404 1209 var logScale2 =this.selectScaleY2.getValue(); … … 1413 1218 //sélection du type de tracé pour Y2 (pas de valeur si l'option n'est pas activée) 1414 1219 if ( this.selectTypeTraceY2.isDisable == true) 1415 // if ( document.getElementById("selectTypePlotY2" ).disabled == true)1416 1220 { 1417 1221 var lineType2 = ""; … … 1420 1224 { 1421 1225 var lineType2 = "-line_type2 "+this.selectTypeTraceY2.getValue(); 1422 // var lineType2 = "-line_type2 "+document.getElementById('selectTypePlotY2').options[document.getElementById('selectTypePlotY2').selectedIndex].value;1423 1226 } 1424 1227 … … 1431 1234 1432 1235 //construction de la requête Fortran 1433 // var parameters = "&fortranRequest="+paramBase+" "+isotopesSelectedName+" "+rangeLower+" "+rangeUpper+" "+TransitionUpper+" "+TransitionLower+" "+intensityLower+" "+intensityUpper+" "+1434 // meanValue+" "+nbCourbes+" "+field+" "+logScale+" "+lineType+" "+field2+" "+logScale2+" "+lineType2;1435 1236 1436 1237 var parameters = "&fortranRequest="+paramBase+" "+isotopesSelectedName+" "+rangeLower+" "+rangeUpper+" "+samplingStep+" "+intensityLower+" "+intensityUpper+" "+ 1437 1238 meanValue+" "+nbCourbes+" "+field+" "+logScale+" "+lineType+" "+field2+" "+logScale2+" "+lineType2; 1438 1239 1439 //alert ("parameters"+parameters);1440 1240 1441 1241 //remplacement de espace par "EEE" pour que le shell script ne voit qu'un seul argument en entrée … … 1453 1253 //en cas de succes appel de la fonction "handleGeisa" 1454 1254 $.ajax( { 1455 //url: "project?methodName=createUserRequest&"+parameters+"&nbGraph="+ this.nbGraph,1456 //url: "project?methodName=createUserRequest&"+parameters+"&transitionUpper="+ transitionUpper+"&transitionLower="+ transitionLower+"&nbGraph="+ this.nbGraph,1457 1255 url: "project?methodName=createUserRequest&"+parameters+"&transitionUpper="+ transitionUpper+"&transitionLower="+ transitionLower+"&nbGraph="+ this.nbGraph+"&nomFichier="+this.nomFichier+"&NomRepFileOut="+this.NomRepFileOut, 1458 1256 success:jQuery.proxy( this.handleGeisa, this ) … … 1500 1298 if (nbMolecules > 1) 1501 1299 { 1502 1503 //this.selectTransitionLower.disable();1504 //this.selectTransitionUpper.disable();1505 1300 //ajoute une classe à celle déjà existante de transitionUpper 1506 1301 $("#transitionUpper").addClass("notActiveText"); … … 1509 1304 else 1510 1305 { 1511 //this.selectTransitionLower.enable();1512 //this.selectTransitionUpper.enable();1513 1306 $("#transitionUpper").removeClass("notActiveText"); 1514 1307 $("#transitionLower").removeClass("notActiveText"); … … 1519 1312 if (nbMolecules == 1 ) 1520 1313 { 1521 // $.ajax( { 1522 // url: "project?methodName=getTransitionByIsotopeName&isotopesSelectedName="+isotopesSelectedName+"&GeisaSelectedDatabase="+GeisaSelectedDatabase+"&spectralRangeLower="+spectralRangeLower+"&spectralRangeUpper="+spectralRangeUpper, 1523 // success:jQuery.proxy( this.handleRequestTransition, this ) 1524 // } ); 1314 1525 1315 1526 1316 $.ajax( { … … 1540 1330 if (nbMolecules == 0 ) 1541 1331 { 1542 //this.selectTransitionLower.add('-1', "Select a molecule");1543 1332 this.selectTransitionLower.append($( document.createElement( "option" ) ).attr( {value:"-1", text:"Select a molecule", selected:"selected"} )); 1544 //this.selectTransitionUpper.add('-1', "Select a molecule");1545 1333 this.selectTransitionUpper.append($( document.createElement( "option" ) ).attr( {value:"-1", text:"Select a molecule", selected:"selected"} )); 1546 1334 //pour forcer à afficher le premier élément (et non le premier élément précédent) … … 1551 1339 if (nbMolecules > 1 ) 1552 1340 { 1553 //this.selectTransitionLower.add('-1', "Select a molecule"); 1341 1554 1342 this.selectTransitionLower.append($( document.createElement( "option" ) ).attr( {value:"-1", text:"", selected:"selected", disabled:"disabled"} )); 1555 //this.selectTransitionUpper.add('-1', "Select a molecule");1556 1343 this.selectTransitionUpper.append($( document.createElement( "option" ) ).attr( {value:"-1", text:"", selected:"selected", disabled:"disabled"} )); 1557 1344 //pour forcer à afficher le premier élément (et non le premier élément précédent) … … 1713 1500 var transitionsUpper = jQuery.parseJSON( result ).transitionsUpper; 1714 1501 1715 1716 1502 //pour vider les menus déroulant des transitions précédentes 1503 // this.selectTransitionLower.clear(); 1717 1504 document.getElementById("transition2").length=0; 1718 1505 //this.selectTransitionUpper.clear(); 1719 1506 document.getElementById("transition1").length=0; 1507 1720 1508 // this.selectTransitionLower.add('transition', "Choose a transition"); 1721 1509 this.selectTransitionLower.append($( document.createElement( "option" ) ).attr( {value:"transition", text:"Choose a transition", disabled:"disabled", selected:"selected"} )); 1722 1723 1510 // this.selectTransitionUpper.add('transition', "Choose a transition"); 1724 1511 this.selectTransitionUpper.append($( document.createElement( "option" ) ).attr( {value:"transition", text:"Choose a transition", disabled:"disabled", selected:"selected"} )); 1725 1726 //pour forcer à afficher le premier élément (et non le premier élément précédent) 1512 //pour forcer à afficher le premier élément (et non le premier élément précédent) 1727 1513 // this.selectTransitionLower.selectFirst(); 1728 1514 // this.selectTransitionUpper.selectFirst(); … … 1754 1540 document.getElementById("transition1").length=0; 1755 1541 1756 this.selectTransitionLower.append($( document.createElement( "option" ) ).attr( {value:" errorRequest", text:"Choose a transition", disabled:"disabled", selected:"selected"} ));1757 this.selectTransitionUpper.append($( document.createElement( "option" ) ).attr( {value:" errorRequest", text:"Choose a transition", disabled:"disabled", selected:"selected"} ));1542 this.selectTransitionLower.append($( document.createElement( "option" ) ).attr( {value:"requestError", text:"Choose a transition", disabled:"disabled", selected:"selected"} )); 1543 this.selectTransitionUpper.append($( document.createElement( "option" ) ).attr( {value:"requestError", text:"Choose a transition", disabled:"disabled", selected:"selected"} )); 1758 1544 1759 1545 }, … … 2127 1913 OnclickVerifTransition : function() 2128 1914 { 1915 //si l'utilisateur change les valeurs de spectral range et clique directement sur le menu déroulant des transitions 1916 //le menu déroulant ne se met pas à jour avant de faire la vérification 1917 this.containerFormSpectralRangeLower.blur(); 1918 this.containerFormSpectralRangeUpper.blur(); 1919 1920 1921 1922 2129 1923 //si il n'y a qu'un élément dans les menu déroulant transition upper et lower et que la valeur est "transition" 2130 1924 //cas où la requete utilisateur est correct mais il n'y a pas de transition pour cette molecule t ce domaine spectral 2131 1925 if (document.getElementById('transition1').length==1 && document.getElementById('transition1').options[0].value=="transition" && document.getElementById('transition2').length==1 && document.getElementById('transition2').options[0].value=="transition") 2132 1926 { 2133 alert("Change isotopologues selection or spectral range values to obtain transition values"); 1927 // document.getElementById( "transitionUpper" ).style.display = "none"; 1928 // document.getElementById( "transitionLower" ).style.display = "none"; 1929 this.selectTransitionUpper.blur(); 1930 this.selectTransitionLower.blur(); 1931 alert("Change isotopologues selection or spectral range values to obtain transition values"); 1932 1933 //document.getElementById( "transitionUpper" ).style.display = ""; 1934 //document.getElementById( "transitionLower" ).style.display = ""; 2134 1935 } 2135 1936 //si il n'y a qu'un élément dans les menu déroulant transition upper et lower et que la valeur est "transition" 2136 1937 //cas où la requete est fausse = les valeurs du domaine spectral sont fausses 2137 if (document.getElementById('transition1').length==1 && document.getElementById('transition1').options[0].value=="errorRequest" && document.getElementById('transition2').length==1 && document.getElementById('transition2').options[0].value=="errorRequest") 2138 { 1938 if (document.getElementById('transition1').length==1 && document.getElementById('transition1').options[0].value=="requestError" && document.getElementById('transition2').length==1 && document.getElementById('transition2').options[0].value=="requestError") 1939 { 1940 this.selectTransitionUpper.blur(); 1941 this.selectTransitionLower.blur(); 1942 //document.getElementById( "transitionUpper" ).style.display = "none"; 1943 // document.getElementById( "transitionLower" ).style.display = "none"; 2139 1944 alert("Change spectral range values to obtain transition values"); 2140 } 1945 // document.getElementById( "transitionUpper" ).style.display = ""; 1946 // document.getElementById( "transitionLower" ).style.display = ""; 1947 } 1948 1949 2141 1950 }, 2142 1951 -
geisa/web/initGeisa_script_OLD.jsp
r671 r674 526 526 var inputSpectralRangeLower = $( document.createElement( "input" ) ); 527 527 inputSpectralRangeLower.attr( {id:"rangeLower", class:"styleInputs"} ); 528 inputSpectralRangeLower.val(0);528 //inputSpectralRangeLower.val(0); 529 529 //pour mettre à jour le menu déroulant des transitions 530 530 inputSpectralRangeLower.bind( 'blur', this, jQuery.proxy( this.requestTransition, this )); … … 533 533 var inputSpectralRangeUpper = $( document.createElement( "input" ) ); 534 534 inputSpectralRangeUpper.attr( {id:"rangeUpper"} ); 535 inputSpectralRangeUpper.val(35877.030506);535 //inputSpectralRangeUpper.val(35877.030506); 536 536 //pour mettre à jour le menu déroulant des transitions lorsque l'on change la valeur du spectral range 537 537 inputSpectralRangeUpper.bind( 'blur', this, jQuery.proxy( this.requestTransition, this )); … … 1754 1754 document.getElementById("transition1").length=0; 1755 1755 1756 this.selectTransitionLower.append($( document.createElement( "option" ) ).attr( {value:" errorRequest", text:"Choose a transition", disabled:"disabled", selected:"selected"} ));1757 this.selectTransitionUpper.append($( document.createElement( "option" ) ).attr( {value:" errorRequest", text:"Choose a transition", disabled:"disabled", selected:"selected"} ));1756 this.selectTransitionLower.append($( document.createElement( "option" ) ).attr( {value:"requestError", text:"Choose a transition", disabled:"disabled", selected:"selected"} )); 1757 this.selectTransitionUpper.append($( document.createElement( "option" ) ).attr( {value:"requestError", text:"Choose a transition", disabled:"disabled", selected:"selected"} )); 1758 1758 1759 1759 }, … … 2127 2127 OnclickVerifTransition : function() 2128 2128 { 2129 //si l'utilisateur cahnge les valeurs de spectral range et clique directement sur le menu déroulant des transitions 2130 //requestTransition met le menu déroulant à jour avec les nouvelle valeurs de spectral range avant de fair la vérification 2131 this.requestTransition(); 2132 2129 2133 //si il n'y a qu'un élément dans les menu déroulant transition upper et lower et que la valeur est "transition" 2130 2134 //cas où la requete utilisateur est correct mais il n'y a pas de transition pour cette molecule t ce domaine spectral 2131 2135 if (document.getElementById('transition1').length==1 && document.getElementById('transition1').options[0].value=="transition" && document.getElementById('transition2').length==1 && document.getElementById('transition2').options[0].value=="transition") 2132 2136 { 2133 alert("Change isotopologues selection or spectral range values to obtain transition values"); 2137 2138 alert("Change isotopologues selection or spectral range values to obtain transition values"); 2134 2139 } 2135 2140 //si il n'y a qu'un élément dans les menu déroulant transition upper et lower et que la valeur est "transition" 2136 2141 //cas où la requete est fausse = les valeurs du domaine spectral sont fausses 2137 if (document.getElementById('transition1').length==1 && document.getElementById('transition1').options[0].value=="errorRequest" && document.getElementById('transition2').length==1 && document.getElementById('transition2').options[0].value=="errorRequest") 2138 { 2142 if (document.getElementById('transition1').length==1 && document.getElementById('transition1').options[0].value=="requestError" && document.getElementById('transition2').length==1 && document.getElementById('transition2').options[0].value=="requestError") 2143 { 2144 2139 2145 alert("Change spectral range values to obtain transition values"); 2140 2146 }
Note: See TracChangeset
for help on using the changeset viewer.
