Commit 6c54c49fcd4c8813267725d76b83f11b081edea7
1 parent
f1484e8a
Exists in
master
9059: ajout d'un tooltip et de la description des repères dans le Help.
Passage de la page en dynamique pour ne plus nécessiter de mise à jour manuelle. il faut uniquement mettre à jour le fichier server/kernel/data/frames.xml.
Showing
4 changed files
with
66 additions
and
77 deletions
Show diff stats
ihm/app/Messages.js
@@ -92,6 +92,38 @@ Ext.define("treps.Messages", | @@ -92,6 +92,38 @@ Ext.define("treps.Messages", | ||
92 | this.bubble.hide(); | 92 | this.bubble.hide(); |
93 | this.bubble.setTarget(null); | 93 | this.bubble.setTarget(null); |
94 | } | 94 | } |
95 | + }, | ||
96 | + | ||
97 | + showBubbleTT: function(title, messageHTML, target, anchor) | ||
98 | + { | ||
99 | + if (!this.bubble) | ||
100 | + this.bubble = new Ext.ToolTip({ | ||
101 | + target: target, | ||
102 | + anchor: anchor, | ||
103 | + anchorToTarget: true, | ||
104 | + title: title, | ||
105 | + html: messageHTML, | ||
106 | + closable: false, | ||
107 | + showDelay: 1000, | ||
108 | + dismissDelay: 10000, | ||
109 | + autoHide: true | ||
110 | + }); | ||
111 | + else | ||
112 | + { | ||
113 | + this.hideBubble(); | ||
114 | + this.bubble.setTitle(title); | ||
115 | + this.bubble.update(messageHTML); | ||
116 | + this.bubble.setTarget(target); | ||
117 | + this.bubble.anchor = anchor; | ||
118 | + this.bubble.showDelay = 1000; | ||
119 | + this.bubble.dismissDelay = 10000; | ||
120 | + this.bubble.autoHide = true; | ||
121 | + } | ||
122 | + | ||
123 | + this.bubble.show(); | ||
95 | } | 124 | } |
125 | + | ||
96 | } | 126 | } |
127 | + | ||
128 | + | ||
97 | ); | 129 | ); |
ihm/app/controller/Application/Help/Help.js
@@ -5,9 +5,10 @@ Ext.define('treps.controller.Application.Help.Help', { | @@ -5,9 +5,10 @@ Ext.define('treps.controller.Application.Help.Help', { | ||
5 | 'Application.Help.HelpPanel', | 5 | 'Application.Help.HelpPanel', |
6 | 'Application.Footer.FooterToolbar' | 6 | 'Application.Footer.FooterToolbar' |
7 | ], | 7 | ], |
8 | - | 8 | + |
9 | stores: [ | 9 | stores: [ |
10 | - 'Helps' | 10 | + 'Helps', |
11 | + 'Frames' | ||
11 | ], | 12 | ], |
12 | 13 | ||
13 | refs: [ | 14 | refs: [ |
@@ -50,8 +51,12 @@ Ext.define('treps.controller.Application.Help.Help', { | @@ -50,8 +51,12 @@ Ext.define('treps.controller.Application.Help.Help', { | ||
50 | } | 51 | } |
51 | } | 52 | } |
52 | ); | 53 | ); |
53 | - }, | 54 | + |
55 | + | ||
56 | + | ||
54 | 57 | ||
58 | + }, | ||
59 | + | ||
55 | onAbout: function() | 60 | onAbout: function() |
56 | { | 61 | { |
57 | this.setHelp('about'); | 62 | this.setHelp('about'); |
@@ -71,6 +76,10 @@ Ext.define('treps.controller.Application.Help.Help', { | @@ -71,6 +76,10 @@ Ext.define('treps.controller.Application.Help.Help', { | ||
71 | return; | 76 | return; |
72 | } | 77 | } |
73 | 78 | ||
79 | + | ||
80 | + var lFrames = this.getFramesStore(); | ||
81 | + //lFrames.load(); | ||
82 | + | ||
74 | var file = page.get('file'); | 83 | var file = page.get('file'); |
75 | var renderer = this.getRendererPanel(); | 84 | var renderer = this.getRendererPanel(); |
76 | 85 | ||
@@ -97,6 +106,25 @@ Ext.define('treps.controller.Application.Help.Help', { | @@ -97,6 +106,25 @@ Ext.define('treps.controller.Application.Help.Help', { | ||
97 | 106 | ||
98 | //3DView WS documentation | 107 | //3DView WS documentation |
99 | text = text.replace(/@@treps_wsdoc@@/g, treps.Constants.WS_DOC); | 108 | text = text.replace(/@@treps_wsdoc@@/g, treps.Constants.WS_DOC); |
109 | + | ||
110 | + | ||
111 | + //generate about help | ||
112 | + //text+="<br/>page selected : "+pageId; | ||
113 | + if(pageId=='about') { | ||
114 | + text+="<ul>"; | ||
115 | + lFrames.each(function(record){ | ||
116 | + if(record.get("description") === "") { | ||
117 | + text+="<li>"+record.get("id")+" - "+record.get("fullname")+"</li>"; | ||
118 | + } else{ | ||
119 | + var desc = record.get("description").replace(/'/g,"\\'").replace(/(?:\r\n|\r|\n)/g,'<br>'); | ||
120 | + text+="<li onmouseover=\"treps.Messages.showBubbleTT('"+record.get("id")+"','"+desc+"',this,'top')\">"+record.get("id")+" - "+record.get("fullname")+"</li>"; | ||
121 | + } | ||
122 | + }); | ||
123 | + text+="</ul>"; | ||
124 | + | ||
125 | + } | ||
126 | + | ||
127 | + | ||
100 | 128 | ||
101 | loader.getTarget().update(text); | 129 | loader.getTarget().update(text); |
102 | return true; | 130 | return true; |
@@ -131,4 +159,6 @@ Ext.define('treps.controller.Application.Help.Help', { | @@ -131,4 +159,6 @@ Ext.define('treps.controller.Application.Help.Help', { | ||
131 | if (versionDiv) | 159 | if (versionDiv) |
132 | Ext.fly('about-version').update("Kernel Version: "+kernelVersion); | 160 | Ext.fly('about-version').update("Kernel Version: "+kernelVersion); |
133 | } | 161 | } |
162 | + | ||
163 | + | ||
134 | }); | 164 | }); |
ihm/app/store/Frames.js
@@ -10,6 +10,7 @@ Ext.define('treps.store.Frames', { | @@ -10,6 +10,7 @@ Ext.define('treps.store.Frames', { | ||
10 | 10 | ||
11 | sortOnLoad: true, | 11 | sortOnLoad: true, |
12 | remoteSort: false, | 12 | remoteSort: false, |
13 | + autoLoad: true, | ||
13 | 14 | ||
14 | proxy: { | 15 | proxy: { |
15 | type: 'direct', | 16 | type: 'direct', |
ihm/help/about
@@ -2,80 +2,6 @@ | @@ -2,80 +2,6 @@ | ||
2 | Space physics coordinate and time transformation tool. | 2 | Space physics coordinate and time transformation tool. |
3 | <br/> | 3 | <br/> |
4 | <br/> | 4 | <br/> |
5 | -Access the TREPS paper published in PSS: <a href="https://doi.org/10.1016/j.pss.2017.06.002" target="_blank">Génot et al., 2017</a> | ||
6 | -<br/> | ||
7 | Kernel version : @@treps_version@@ | 5 | Kernel version : @@treps_version@@ |
8 | <br/> | 6 | <br/> |
9 | Coordinate systems list : | 7 | Coordinate systems list : |
10 | -<ul> | ||
11 | -<li>67PCG_CSO - Comet solar oriented centered on comet 67P/CG</li> | ||
12 | -<li>67PCG_EME - EME2000 centered on comet Churyumov Gerasimenko</li> | ||
13 | -<li>CPHIO - Callisto Phi-Omega</li> | ||
14 | -<li>DIIS - Dione Inter-action coordinate System</li> | ||
15 | -<li>DME - DEIMOS Moon Mean Equator</li> | ||
16 | -<li>DSE - DEIMOS Moon-centric Solar Ecliptic</li> | ||
17 | -<li>ECLIPDATE - Earth Mean Ecliptic and Equinox</li> | ||
18 | -<li>ECLIPJ2000 - Ecliptic coordinates based upon the J2000 frame</li> | ||
19 | -<li>EME - Earth Mean Equator and Equinox</li> | ||
20 | -<li>ENIS - Enceladus Inter-action coordinate System</li> | ||
21 | -<li>EPHIO - Europa Phi-Omega</li> | ||
22 | -<li>GPHIO - Ganymede Phi-Omega</li> | ||
23 | -<li>GS_CSO - Comet solar oriented centered on asteroid GRIGG-SKJELLERUP</li> | ||
24 | -<li>GS_EME - EME2000 centered on asteroid GRIGG-SKJELLERUP</li> | ||
25 | -<li>GSE - Geocentric Solar Ecliptic</li> | ||
26 | -<li>GSEQ - Geocentric Solar Equatorial</li> | ||
27 | -<li>GSM - Geocentric Solar Magnetospheric</li> | ||
28 | -<li>HALLEY_CSO - Comet solar oriented centered on asteroid HALLEY</li> | ||
29 | -<li>HALLEY_EME -EME2000 centered on asteroid HALLEY </li> | ||
30 | -<li>HCI - Heliocentric Inertial</li> | ||
31 | -<li>HEE - Heliocentric Earth Ecliptic</li> | ||
32 | -<li>HEEQ - Heliocentric Earth Equatorial</li> | ||
33 | -<li>IAU_EARTH - International Astronomical Union Earth</li> | ||
34 | -<li>IAU_JUPITER - International Astronomical Union Jupiter</li> | ||
35 | -<li>IAU_MARS - International Astronomical Union Mars</li> | ||
36 | -<li>IAU_MOON - International Astronomical Union Moon</li> | ||
37 | -<li>IAU_MERCURY - International Astronomical Union Mercury</li> | ||
38 | -<li>IAU_NEPTUNE - International Astronomical Union Neptune</li> | ||
39 | -<li>IAU_PLUTO - International Astronomical Union Pluton</li> | ||
40 | -<li>IAU_SATURN - International Astronomical Union Saturn</li> | ||
41 | -<li>IAU_URANUS - International Astronomical Union Uranus</li> | ||
42 | -<li>IAU_VENUS - International Astronomical Union Venus</li> | ||
43 | -<li>IPHIO - Io Phi-Omega</li> | ||
44 | -<li>J2000 - Earth mean equator, dynamical equinox of J2000</li> | ||
45 | -<li>JECLIP - ECLIPJ2000 centered on Jupiter</li> | ||
46 | -<li>JEME - EME2000 centered on Jupiter</li> | ||
47 | -<li>JSM - Jovian Solar Magnetospheric</li> | ||
48 | -<li>JSO - Jovian Solar Orbital</li> | ||
49 | -<li>KECLIP - ECLIPJ2000 centered on Saturn</li> | ||
50 | -<li>KEME - EME2000 centered on Saturn</li> | ||
51 | -<li>KSM - Kronian Solar Magnetospheric</li> | ||
52 | -<li>KSO - Kronian Solar Orbital</li> | ||
53 | -<li>LME - Moon Mean Equator</li> | ||
54 | -<li>LSE - Selenocentric Solar Ecliptic</li> | ||
55 | -<li>LUTETIA_CSO - Comet solar oriented centered on asteroid LUTETIA</li> | ||
56 | -<li>LUTETIA_EME - EME2000 centered on asteroid LUTETIA</li> | ||
57 | -<li>MAG - Geomagnetic coordinate system</li> | ||
58 | -<li>MECLIP - ECLIPJ2000 centered on Mercury</li> | ||
59 | -<li>MEME - EME2000 centered on Mercury</li> | ||
60 | -<li>MESO - Mercury-centric Solar Orbital</li> | ||
61 | -<li>MIIS - Mimas Inter-action coordinate System</li> | ||
62 | -<li>MME - Mars Mean Equator</li> | ||
63 | -<li>MSO - Mars-centric Solar Orbital</li> | ||
64 | -<li>NECLIP - ECLIPJ2000 centered on Neptune</li> | ||
65 | -<li>NEME -EME2000 centered on Neptune</li> | ||
66 | -<li>PECLIP - ECLIPJ2000 centered on Pluto</li> | ||
67 | -<li>PEME - EME2000 centered on Pluto</li> | ||
68 | -<li>PME - PHOBOS Moon Mean Equator</li> | ||
69 | -<li>PSE - PHOBOS Moon-centric Solar Ecliptic</li> | ||
70 | -<li>RHIS - Rhea Inter-action coordinate System</li> | ||
71 | -<li>SM - Solar Magnetic coordinates</li> | ||
72 | -<li>STEINS_CSO - Comet solar oriented centered on asteroid STEINS</li> | ||
73 | -<li>STEINS_EME - EME2000 centered on asteroid STEINS</li> | ||
74 | -<li>SYSTEM_3 - SYSTEM 3 centered on Jupiter</li> | ||
75 | -<li>TEIS - Tethys Inter-action coordinate System</li> | ||
76 | -<li>TIIS - TItan Inter-action coordinate System</li> | ||
77 | -<li>UECLIP - ECLIPJ2000 centered on Uranus</li> | ||
78 | -<li>UEME - EME2000 centered on Uranus</li> | ||
79 | -<li>VME - Venus Mean Equator</li> | ||
80 | -<li>VSO - Venus Solar Orbital</li> | ||
81 | -</ul> |