- Timestamp:
- 12/04/12 17:04:39 (12 years ago)
- Location:
- geisa
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
geisa/persistence/implementation/hibernate.cfg.xml
r674 r675 36 36 37 37 <!-- configuration pool via c3p0--> 38 <prop key="hibernate.connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</prop>38 <prop key="hibernate.connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</prop> 39 39 <prop key="hibernate.connection.driver_class">com.mysql.jdbc.Driver</prop> 40 40 <prop key="hibernate.connection.url">jdbc:mysql://localhost/geisa</prop> 41 41 42 <!-- en local--> 43 <prop key="hibernate.connection.username">root</prop> 44 <!-- sur naboo --> 45 <!--<prop key="hibernate.connection.username">geisa</prop>--> 42 <prop key="hibernate.connection.username">geisa</prop> 46 43 <prop key="hibernate.connection.password">geisa11</prop> 47 44 <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop> -
geisa/web/initGeisa.jsp
r674 r675 45 45 <fieldset class="general"><legend><span class="fieldsetGeneralTitle">Inputs :</span></legend> 46 46 <div id="database" class="database"> 47 <fieldset class="options"><legend><a href="#" TITLE="Help text for users"><b>?</b></a> <b>Choosing database :</b></legend> 48 <div id="database1" class="containerInsideOptions"> 49 </div> 47 <fieldset class="options"><legend> <b>Choosing database :</b></legend> 48 <div id="database1" class="containerInsideOptions"></div> 49 <!--Pour l'onglet "Database comparison" --> 50 <div style="display:none;" id="database2" class="containerInsideOptionsRight"></div> 50 51 </fieldset> 51 52 </div> 52 53 53 54 <div id="molecules" class="molecules"> 54 <fieldset class="options"><legend> <a href="#" TITLE="Help text for users"><b>?</b></a><b>Choosing molecules :</b></legend>55 <fieldset class="options"><legend> <b>Choosing molecules :</b></legend> 55 56 <div id="BDD-GEISA2011" class="moleculesGEISA11"> 56 57 </div> … … 89 90 90 91 <div id="axeY1Gene" class="axeY1Gene"> 91 <fieldset class="options"><legend><a href="#" TITLE=" Help text for users"><b>?</b></a> <b>Choosing line transition parameter :</b></legend>92 <fieldset class="options"><legend><a href="#" TITLE="Choose the spectral parameter to draw (intensity, HWM ..etc.) according to wavenumbers."><b>?</b></a> <b>Choosing line transition parameter :</b></legend> 92 93 <div id="axeY1" class="containerInsideOptions"></div> 93 94 </fieldset> … … 95 96 96 97 <div id="drawingOptionsY1" class="drawingOptionsY1"> 97 <fieldset class="options"><legend> <a href="#" TITLE="Help text for users"><b>?</b></a><b>Drawing options :</b></legend>98 <fieldset class="options"><legend> <b>Drawing options :</b></legend> 98 99 <div id="nbCourbes" class="containerInsideOptions"></div> 99 100 <div id="scaleY1Titre" class="containerInsideOptions"></div> 100 101 <div id="scaleY1" class="containerInsideOptions"></div> 101 102 <div id="typePlotY1" class="containerInsideOptions"></div> 103 <!--Pour l'onglet "Database comparison" --> 104 <div style="display:none;" id="typePlotDatabase2" class="containerInsideOptions"></div> 102 105 </fieldset> 103 106 </div> … … 111 114 <fieldset class="general"><legend><span class="fieldsetGeneralTitle">Advanced Options :</span></legend> 112 115 <div id="transition" class="transition"> 113 <fieldset class="options"><legend><a href="#" TITLE=" Help text for users"><b>?</b></a> <b>Choosing vibrational transitions :</b></legend>116 <fieldset class="options"><legend><a href="#" TITLE="You can choose an upper and/or a lower vibrational state related to a given molecule. This option is available only when a single molecule is selected. The list of available states depends on the chosen molecule and on the spectral interval. "><b>?</b></a> <b>Choosing vibrational transitions :</b></legend> 114 117 <div id="transitionValue" class="transitionValue"> 115 118 <div id="transitionUpper" class="containerInsideOptions"></div> … … 122 125 123 126 <div id="meanValue" class="meanValue"> 124 <fieldset class="options"><legend><a href="#" TITLE=" Help text for users"><b>?</b></a> <b>Spectral step:</b></legend>127 <fieldset class="options"><legend><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."><b>?</b></a> <b>Parameter mean values :</b></legend> 125 128 <div id="meanValue1" class="containerInsideOptions"></div> 126 129 </fieldset> … … 128 131 129 132 <div id="axeY2Gene" class="axeY2Gene"> 130 <fieldset class="options"><legend><a href="#" TITLE=" Help text for users"><b>?</b></a> <b>Choosing secondary line transition parameter :</b></legend>133 <fieldset class="options"><legend><a href="#" TITLE="By this option, you can draw a secondary parameter (coupled with a primary one) using the right Y-Axis. "><b>?</b></a> <b>Choosing secondary line transition parameter :</b></legend> 131 134 <div id="axeY2Titre" class="containerInsideOptions"></div> 132 135 <div id="axeY2" class="containerInsideOptions"></div> … … 135 138 136 139 <div id="drawingOptionsY2" class="drawingOptionsY2"> 137 <fieldset class="options"><legend> <a href="#" TITLE="Help text for users"><b>?</b></a><b>Drawing options (secondary parameter) :</b></legend>140 <fieldset class="options"><legend> <b>Drawing options (secondary parameter) :</b></legend> 138 141 <div id="scaleY2Titre" class="containerInsideOptions"></div> 139 142 <div id="scaleY2" class="containerInsideOptions"></div> … … 142 145 </fieldset> 143 146 </div> 144 147 <!--Pour l'onglet "Database comparison" --> 148 <div style="display:none;" id="outputDatabaseComparison" class="outputDatabaseComparison"> 149 <fieldset class="options"><legend> <b>Database comparison output choice :</b></legend> 150 <div id="outputDatabaseComparisonChoice" class="containerInsideOptions"></div> 151 152 </fieldset> 153 </div> 145 154 </fieldset> 146 155 </div> -
geisa/web/initGeisa_script.jsp
r674 r675 36 36 var downloadButton = new Button( {value:"Download", parent:$( "#downloadContainer" ), id:"button_submit_2", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickDownload, this )} ); 37 37 38 var ntab = new Tab( {value:"pif", parent:this.containerTabs, numTab: 1, id:"tab_test1", className: "tab_class", onClick:jQuery.proxy( this.onClickTab, this )} ); 39 ntab.active(); 38 //onglet 39 this.ntabComparison = new Tab( {value:"Databases comparison", parent:this.containerTabs, numTab: 1, id:"tab_Comparison", className: "tab_class", onClick:jQuery.proxy( this.onClickDatabasesComparison, this )} ); 40 this.ntabGlobal = new Tab( {value:"Global representation", parent:this.containerTabs, numTab: 1, id:"tab_Global", className: "tab_class", onClick:jQuery.proxy( this.onClickGlobalRepresentation, this )} ); 41 this.ntabContents = new Tab( {value:"Database contents", parent:this.containerTabs, numTab: 1, id:"tab_Contents", className: "tab_class", onClick:jQuery.proxy( this.onClickDatabaseContents, this )} ); 42 //onglet avec la couleur active par défaut 43 this.ntabContents.active(); 40 44 }, 41 45 … … 480 484 var bob = this.selectDatabase.getValues(); 481 485 486 // Create menu deroulant choix de la base2 pour l'onglet "Database comparison" 487 var paramDatabase2 = new Object(); 488 paramDatabase2.id = "selectDatabase2"; 489 paramDatabase2.parent = $("#database2"); 490 this.selectDatabase2 = new Select( paramDatabase ); 491 this.selectDatabase2.add( 'GEISA2011', "GEISA 2011", jQuery.proxy(this.onClickSelectDatabase, this), '<%=IsotopeG09.class%>' ); 492 this.selectDatabase2.add( 'GEISA2003', "GEISA 2003", jQuery.proxy(this.onClickSelectDatabase, this), '<%=IsotopeG03.class%>' ); 493 this.selectDatabase2.selectFirst( false ); 494 495 496 482 497 483 498 //création du bloc des molécules … … 488 503 489 504 //bouton selection-deselection toutes les molécules et isotopes 490 this.selectButton = new Button( {value:"Select all isotopologues", parent:$( "#selectAndShow" ), id:"buttonSelect", className: "gray_button", onClick:jQuery.proxy( this.selectAll, this )} );505 this.selectButton = new Button( {value:"Select all molecules", parent:$( "#selectAndShow" ), id:"buttonSelect", className: "gray_button", onClick:jQuery.proxy( this.selectAll, this )} ); 491 506 //bouton montrer-cacher les isotopes 492 507 this.showButton = new Button( {value:"View all isotopologues", parent:$( "#selectAndShow" ), id:"buttonShow", className: "gray_button", onClick:jQuery.proxy( this.viewAll, this )} ); … … 502 517 document.getElementById("spectralRangeLower").innerHTML = "Lower value, cm<sup>-1</sup> : "; 503 518 document.getElementById("spectralRangeUpper").innerHTML = "Upper value, cm<sup>-1</sup> : "; 504 document.getElementById("samplingStep").innerHTML = "<br> Sampling step : ";519 document.getElementById("samplingStep").innerHTML = "<br><a href='#' TITLE='Allows to explore the chosen spectral range by generating a graph every spectral step (in the whole chosen spectral range). The default value is equal to size of the selected spectral range.'><b>?</b></a> Sampling step : "; 505 520 //zone texte SpectralRangeLower 506 521 var inputSpectralRangeLower = $( document.createElement( "input" ) ); 507 522 inputSpectralRangeLower.attr( {id:"rangeLower", class:"styleInputs"} ); 523 inputSpectralRangeLower.val(0); 508 524 //pour mettre à jour le menu déroulant des transitions 509 525 inputSpectralRangeLower.bind( 'blur', this, jQuery.proxy( this.requestTransition, this )); … … 512 528 var inputSpectralRangeUpper = $( document.createElement( "input" ) ); 513 529 inputSpectralRangeUpper.attr( {id:"rangeUpper"} ); 530 inputSpectralRangeUpper.val(35877.030506); 514 531 //pour mettre à jour le menu déroulant des transitions lorsque l'on change la valeur du spectral range 515 532 inputSpectralRangeUpper.bind( 'blur', this, jQuery.proxy( this.requestTransition, this )); … … 605 622 this.selectTypeTraceY1.selectFirst( false ); 606 623 624 //menu déroulant tracé de la 2Úme base pour l'onglet "Database comparison" 625 var paramSelectTypeTraceDatabase2 = new Object(); 626 paramSelectTypeTraceDatabase2.id = "selectTypePlotDatabase2"; 627 paramSelectTypeTraceDatabase2.parent = $("#typePlotDatabase2"); 628 this.selectTypeTraceDatabase2 = new Select( paramSelectTypeTraceY1 ); 629 this.selectTypeTraceDatabase2.add( 'l', "Lines" ); 630 this.selectTypeTraceDatabase2.add( 'p', "Dots" ); 631 this.selectTypeTraceDatabase2.add( 'i', "Peaks" ); 632 this.selectTypeTraceDatabase2.add( 'lp', "Lines and Dots" ); 633 this.selectTypeTraceDatabase2.selectFirst( false ); 634 607 635 608 636 //lien pour montrer ou cacher le bloc "advanced options" … … 646 674 //Zone text Mean Value 647 675 //Titre 648 var titleMeanValue = document.createTextNode(" Step: ");676 var titleMeanValue = document.createTextNode("Bin-average : "); 649 677 document.getElementById("meanValue1").appendChild(titleMeanValue); 650 678 //champ input … … 711 739 this.selectTypeTraceY2.disable(); 712 740 741 // Create menu deroulant choix de la sortie pour l'onglet "Database comparison" 742 var paramoutputDatabasecomparison = new Object(); 743 paramoutputDatabasecomparison.id = "outputDatabaseComparisonChoice1"; 744 paramoutputDatabasecomparison.parent = $("#outputDatabaseComparisonChoice"); 745 this.selectOutputDatabasecomparison = new Select( paramoutputDatabasecomparison ); 746 this.selectOutputDatabasecomparison.add( 'def', "Default output" ); 747 this.selectOutputDatabasecomparison.add( 'diff_step', "différences moyennes" ); 748 this.selectOutputDatabasecomparison.add( 'diff_step100', "différences moyennes en pourc" ); 749 this.selectOutputDatabasecomparison.add( 'diff_stepboth', "diff moy et diff moy en pourc" ); 750 this.selectOutputDatabasecomparison.selectFirst( false ); 751 713 752 714 753 //création de l'image d'attente … … 956 995 case 'GEISA2003': 957 996 //isNaN = n'est pas un nombre 958 if(isNaN( parseInt(($("#rangeLower").val()))) == true || parseInt($("#rangeLower").val()) < 0 || parseInt($("#rangeLower").val()) > 35877.030506)997 if(isNaN(($("#rangeLower").val())) == true || parseFloat($("#rangeLower").val()) < 0 || parseFloat($("#rangeLower").val()) > 35877.030506) 959 998 { 960 999 alert("Error: Invalid value for lower spectral range area. The value must be between 0 and 35877.030506"); … … 962 1001 } 963 1002 964 if(isNaN( parseInt(($("#rangeUpper").val()))) == true || parseInt( $("#rangeUpper").val()) == 0 || parseInt( $("#rangeUpper").val()) < 0 || parseInt($("#rangeUpper").val()) > 35877.030506)1003 if(isNaN(($("#rangeUpper").val())) == true || parseFloat( $("#rangeUpper").val()) == 0 || parseFloat( $("#rangeUpper").val()) < 0 || parseFloat($("#rangeUpper").val()) > 35877.030506) 965 1004 { 966 1005 alert("Error: Invalid value for upper spectral range area. The value must be between 0 and 35877.030506"); … … 971 1010 case 'GEISA2011': 972 1011 //isNaN = n'est pas un nombre 973 if(isNaN( parseInt(($("#rangeLower").val()))) == true || parseInt($("#rangeLower").val()) < 0 || parseInt($("#rangeLower").val()) > 35877.030506)1012 if(isNaN(($("#rangeLower").val())) == true || parseFloat($("#rangeLower").val()) < 0 || parseFloat($("#rangeLower").val()) > 35877.030506) 974 1013 { 975 1014 alert("Error: Invalid value for lower spectral range area. The value must be between 0 and 35877.030506"); … … 977 1016 } 978 1017 979 if(isNaN( parseInt(($("#rangeUpper").val()))) == true || parseInt( $("#rangeUpper").val()) == 0 || parseInt( $("#rangeUpper").val()) < 0 || parseInt($("#rangeUpper").val()) > 35877.030506)1018 if(isNaN(($("#rangeUpper").val())) == true || parseFloat( $("#rangeUpper").val()) == 0 || parseFloat( $("#rangeUpper").val()) < 0 || parseFloat($("#rangeUpper").val()) > 35877.030506) 980 1019 { 981 1020 alert("Error: Invalid value for upper spectral range area. The value must be between 0 and 35877.030506"); … … 985 1024 case 'GEISAIASI2003': 986 1025 //isNaN = n'est pas un nombre 987 if(isNaN( parseInt(($("#rangeLower").val()))) == true || parseInt($("#rangeLower").val()) < 0 || parseInt($("#rangeLower").val()) < 599.000793 || parseInt($("#rangeLower").val()) > 3000.998767)1026 if(isNaN(($("#rangeLower").val())) == true || parseFloat($("#rangeLower").val()) < 0 || parseFloat($("#rangeLower").val()) < 599.000793 || parseFloat($("#rangeLower").val()) > 3000.998767) 988 1027 { 989 1028 alert("Error: Invalid value for lower spectral range area. The value must be between 599.000793 and 3000.998767"); … … 991 1030 } 992 1031 993 if(isNaN( parseInt(($("#rangeUpper").val()))) == true || parseInt( $("#rangeUpper").val()) == 0 || parseInt( $("#rangeUpper").val()) < 0 || parseInt($("#rangeUpper").val()) < 599.000793 || parseInt($("#rangeUpper").val()) > 3000.998767)1032 if(isNaN(($("#rangeUpper").val())) == true || parseFloat( $("#rangeUpper").val()) == 0 || parseFloat( $("#rangeUpper").val()) < 0 || parseFloat($("#rangeUpper").val()) < 599.000793 || parseInt($("#rangeUpper").val()) > 3000.998767) 994 1033 { 995 1034 alert("Error: Invalid value for upper spectral range area. The value must be between 599.000793 and 3000.998767"); … … 999 1038 case 'GEISAIASI2011': 1000 1039 //isNaN = n'est pas un nombre 1001 if(isNaN( parseInt(($("#rangeLower").val()))) == true || parseInt($("#rangeLower").val()) < 0 || parseInt($("#rangeLower").val()) < 599.000793 || parseInt($("#rangeLower").val()) > 3000.998767)1040 if(isNaN(($("#rangeLower").val())) == true || parseFloat($("#rangeLower").val()) < 0 || parseFloat($("#rangeLower").val()) < 599.000793 || parseFloat($("#rangeLower").val()) > 3000.998767) 1002 1041 { 1003 1042 alert("Error: Invalid value for lower spectral range area. The value must be between 599.000793 and 3000.998767"); … … 1005 1044 } 1006 1045 1007 if(isNaN( parseInt(($("#rangeUpper").val()))) == true || parseInt( $("#rangeUpper").val()) == 0 || parseInt( $("#rangeUpper").val()) < 0 || parseInt($("#rangeUpper").val()) < 599.000793 || parseInt($("#rangeUpper").val()) > 3000.998767)1046 if(isNaN(($("#rangeUpper").val())) == true || parseFloat( $("#rangeUpper").val()) == 0 || parseFloat( $("#rangeUpper").val()) < 0 || parseFloat($("#rangeUpper").val()) < 599.000793 || parseInt($("#rangeUpper").val()) > 3000.998767) 1008 1047 { 1009 1048 alert("Error: Invalid value for upper spectral range area. The value must be between 599.000793 and 3000.998767"); … … 1621 1660 // EVENTS ******************************************************** 1622 1661 // 1623 1624 1662 //Action quand on clique sur l'onglet DatabaseContents 1663 onClickDatabaseContents: function() 1664 { 1665 //change la couleur des onglets 1666 this.ntabContents.active(); 1667 this.ntabGlobal.inactive(); 1668 this.ntabComparison.inactive(); 1669 //change le titre de la page en fonction de l'onglet cliqué 1670 document.getElementById('titlePage').innerHTML = ""; 1671 document.getElementById('titlePage').innerHTML = "Graphic vizualisation of the GEISA database"; 1672 //Eléments qui apparaissent avec cette option 1673 document.getElementById("axeY1Gene").style.display= ""; 1674 document.getElementById("showAdvancedOptions").style.display= ""; 1675 document.getElementById("axeY2Gene").style.display= ""; 1676 document.getElementById("drawingOptionsY2").style.display= ""; 1677 //Eléments qui disparaissent avec cette option 1678 document.getElementById("database2").style.display= "none"; 1679 document.getElementById("typePlotDatabase2").style.display= "none"; 1680 document.getElementById("outputDatabaseComparison").style.display= "none"; 1681 }, 1682 //Action quand on clique sur l'onglet GlobalRepresentation 1683 onClickGlobalRepresentation: function() 1684 { 1685 //change la couleur des onglets 1686 this.ntabGlobal.active(); 1687 this.ntabContents.inactive(); 1688 this.ntabComparison.inactive(); 1689 //change le titre de la page en fonction de l'onglet cliqué 1690 document.getElementById('titlePage').innerHTML = ""; 1691 document.getElementById('titlePage').innerHTML = "Global Representation"; 1692 //Eléments qui disparaissent avec cette option 1693 document.getElementById("database2").style.display= "none"; 1694 document.getElementById("axeY1Gene").style.display= "none"; 1695 document.getElementById("typePlotDatabase2").style.display= "none"; 1696 document.getElementById("showAdvancedOptions").style.display= "none"; 1697 document.getElementById("advancedOptions").style.display= "none"; 1698 1699 }, 1700 //Action quand on clique sur l'onglet DatabasesComparison 1701 onClickDatabasesComparison: function() 1702 { 1703 //change la couleur des onglets 1704 this.ntabComparison.active(); 1705 this.ntabGlobal.inactive(); 1706 this.ntabContents.inactive(); 1707 //change le titre de la page en fonction de l'onglet cliqué 1708 document.getElementById('titlePage').innerHTML = ""; 1709 document.getElementById('titlePage').innerHTML = "Databases Comparison"; 1710 //Eléments qui apparaissent avec cette option 1711 document.getElementById("database2").style.display= ""; 1712 document.getElementById("typePlotDatabase2").style.display= ""; 1713 document.getElementById("showAdvancedOptions").style.display= ""; 1714 document.getElementById("outputDatabaseComparison").style.display= ""; 1715 //Eléments qui disparaissent avec cette option 1716 document.getElementById("axeY2Gene").style.display= "none"; 1717 document.getElementById("drawingOptionsY2").style.display= "none"; 1718 }, 1625 1719 1626 1720 … … 1631 1725 if ('GEISA2011' == value) 1632 1726 { 1727 //modifier le titre en fonction de la base sélectionnée 1633 1728 document.getElementById('spectralRangeTitre').innerHTML = ""; 1634 1729 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range (0 to 35877.030506 cm<sup>-1</sup>) :"; 1635 //$("#rangeLower").val(0); 1636 //$("#rangeUpper").val(35877.030506); 1637 //$("#rangeLower").val(""); 1638 //$("#rangeUpper").val(""); 1639 1730 1731 //remplir les valeurs par défaut 1732 if($("#rangeLower").val()=="") 1733 { 1734 $("#rangeLower").val(0); 1735 } 1736 if($("#rangeUpper").val()=="") 1737 { 1738 $("#rangeUpper").val(35877.030506); 1739 } 1740 1741 //Si les valeur entrées par l'utilisateur ne sont pas correctes, on remet les valeurs des bornes 1742 if(isNaN(($("#rangeLower").val())) == true || parseFloat( $("#rangeLower").val()) < 0 || parseFloat($("#rangeLower").val()) > 35877.030506) 1743 { 1744 $("#rangeLower").val(0); 1745 } 1746 if(isNaN(($("#rangeLower").val())) == true || parseFloat( $("#rangeUpper").val()) < 0 || parseFloat($("#rangeUpper").val()) > 35877.030506) 1747 { 1748 $("#rangeUpper").val(35877.030506); 1749 } 1750 1751 //afficher le bon bloc de molécules 1640 1752 document.getElementById( "BDD-GEISA2011" ).style.display = ""; 1641 1753 document.getElementById( "BDD-GEISAIASI2011" ).style.display = "none"; … … 1648 1760 document.getElementById('spectralRangeTitre').innerHTML = ""; 1649 1761 document.getElementById('spectralRangeTitre').innerHTML = "Choosing spectral range (599.000793 to 3000.998767 cm<sup>-1</sup>) :"; 1650 //$("#rangeLower").val(599.000793); 1651 //$("#rangeUpper").val(3000.998767); 1652 //$("#rangeLower").val(""); 1653 //$("#rangeUpper").val(""); 1762 1763 1764 //remplir les valeurs par défaut 1765 if($("#rangeLower").val()=="") 1766 { 1767 $("#rangeLower").val(599.000793); 1768 } 1769 if($("#rangeUpper").val()=="") 1770 { 1771 $("#rangeUpper").val(3000.998767); 1772 } 1773 //Si les valeur entrées par l'utilisateur ne sont pas correctes, on remet les valeurs des bornes 1774 if(isNaN(($("#rangeLower").val())) == true || parseFloat( $("#rangeLower").val()) < 599.000793 || parseFloat($("#rangeLower").val()) > 3000.998767) 1775 { 1776 $("#rangeLower").val(599.000793); 1777 } 1778 if(isNaN(($("#rangeLower").val())) == true || parseFloat( $("#rangeUpper").val()) < 599.000793 || parseFloat($("#rangeUpper").val()) > 3000.998767) 1779 { 1780 $("#rangeUpper").val(3000.998767); 1781 } 1654 1782 1655 1783 document.getElementById( "BDD-GEISA2011" ).style.display = "none"; … … 1663 1791 document.getElementById('spectralRangeTitre').innerHTML = ""; 1664 1792 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range (0 to 35877.030506 cm<sup>-1</sup>) :"; 1665 //$("#rangeLower").val(0); 1666 //$("#rangeUpper").val(35877.030506); 1667 //$("#rangeLower").val(""); 1668 // $("#rangeUpper").val(""); 1793 1794 //remplir les valeurs par défaut 1795 if($("#rangeLower").val()=="") 1796 { 1797 $("#rangeLower").val(0); 1798 } 1799 if($("#rangeUpper").val()=="") 1800 { 1801 $("#rangeUpper").val(35877.030506); 1802 } 1803 //Si les valeur entrées par l'utilisateur ne sont pas correctes, on remet les valeurs des bornes 1804 if(isNaN(($("#rangeLower").val())) == true || parseFloat( $("#rangeLower").val()) < 0 || parseFloat($("#rangeLower").val()) > 35877.030506) 1805 { 1806 $("#rangeLower").val(0); 1807 } 1808 if(isNaN(($("#rangeLower").val())) == true || parseFloat( $("#rangeUpper").val()) < 0 || parseFloat($("#rangeUpper").val()) > 35877.030506) 1809 { 1810 $("#rangeUpper").val(35877.030506); 1811 } 1669 1812 1670 1813 document.getElementById( "BDD-GEISA2011" ).style.display = "none"; … … 1677 1820 document.getElementById('spectralRangeTitre').innerHTML = ""; 1678 1821 document.getElementById('spectralRangeTitre').innerHTML = "Choosing spectral range (599.000793 to 3000.998767 cm<sup>-1</sup>) :"; 1679 //$("#rangeLower").val(599.000793); 1680 // $("#rangeUpper").val(3000.998767); 1681 //$("#rangeLower").val(""); 1682 // $("#rangeUpper").val(""); 1822 1823 //remplir les valeurs par défaut 1824 if($("#rangeLower").val()=="") 1825 { 1826 $("#rangeLower").val(599.000793); 1827 } 1828 if($("#rangeUpper").val()=="") 1829 { 1830 $("#rangeUpper").val(3000.998767); 1831 } 1832 //Si les valeur entrées par l'utilisateur ne sont pas correctes, on remet les valeurs des bornes 1833 if(isNaN(($("#rangeLower").val())) == true || parseFloat( $("#rangeLower").val()) < 599.000793 || parseFloat($("#rangeLower").val()) > 3000.998767) 1834 { 1835 $("#rangeLower").val(599.000793); 1836 } 1837 if(isNaN(($("#rangeLower").val())) == true || parseFloat( $("#rangeUpper").val()) < 599.000793 || parseFloat($("#rangeUpper").val()) > 3000.998767) 1838 { 1839 $("#rangeUpper").val(3000.998767); 1840 } 1683 1841 1684 1842 document.getElementById( "BDD-GEISA2011" ).style.display = "none"; … … 1700 1858 1701 1859 1702 if( this.selectButton.getValue() == 'Select all isotopologues')1860 if( this.selectButton.getValue() == 'Select all molecules') 1703 1861 { 1704 1862 for( i = 0; i < count; i++ ) … … 1710 1868 } 1711 1869 } 1712 this.selectButton.setValue("Unselect all isotopologues");1870 this.selectButton.setValue("Unselect all molecules"); 1713 1871 1714 1872 } … … 1723 1881 } 1724 1882 } 1725 this.selectButton.setValue("Select all isotopologues");1883 this.selectButton.setValue("Select all molecules"); 1726 1884 } 1727 1885 … … 1910 2068 }, 1911 2069 1912 // si aucuntransition n'a été trouvée2070 //Alerter l'utilisateur si aucune transition n'a été trouvée 1913 2071 OnclickVerifTransition : function() 1914 2072 { … … 2191 2349 { 2192 2350 this.requestGeisa(); 2193 },2194 2195 onClickTab: function()2196 {2197 alert("paf");2198 2351 }, 2199 2352 -
geisa/web/resources/css/geisa.css
r671 r675 256 256 margin-left: 35px; 257 257 } 258 .containerInsideOptionsRight { 259 margin-left: 35px; 260 261 } 262 258 263 259 264 .database { … … 360 365 } 361 366 367 .outputDatabaseComparison{ 368 float: left; 369 position: relative; 370 width: 410px; 371 margin-left: 5px; 372 margin-bottom: 8px; 373 } 374 362 375 .boutonSubmit{ 363 376 float: right; … … 467 480 .tab_class { 468 481 -moz-border-radius: 4px 4px 0 0; 469 background: none repeat scroll 0 0 #FF7C25; 470 color: white; 482 -moz-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3); 483 background: none repeat scroll 0 0 #a0c3df; 484 color: black; 471 485 float: right; 472 486 height: 19px; 473 487 margin-left: 11px; 474 margin-right: - 10px;488 margin-right: -7px; 475 489 margin-top: 3px; 476 490 padding: 4px; 477 491 } 478 492 .tab_class.activated { 479 background: none repeat scroll 0 0 # D45400;493 background: none repeat scroll 0 0 #6191b5; 480 494 color: black; 481 495 }
Note: See TracChangeset
for help on using the changeset viewer.