Commit 48a8a59803b2ef0474b81ffc8d20729345a10627
Exists in
master
and in
109 other branches
merge with master
Showing
151 changed files
with
1101 additions
and
910 deletions
Show diff stats
Too many changes.
To preserve performance only 100 of 151 files displayed.
.gitignore
... | ... | @@ -2,19 +2,15 @@ data/ |
2 | 2 | shared_data/ |
3 | 3 | generic_data/EPNResources/*.xml |
4 | 4 | generic_data/LocalData/ |
5 | -generic_data/Param/*.xml | |
6 | 5 | generic_data/RemoteData/ |
7 | 6 | generic_data/Statistics/ |
8 | -generic_data/newKernelDDBase/ | |
9 | -generic_data/ParamTemplate/ | |
10 | -generic_data/ParamInfo/*.xml | |
11 | -generic_data/DataSetInfo/ | |
12 | -generic_data/InstrumentInfo/ | |
13 | -generic_data/MissionInfo/ | |
7 | +generic_data/help/ | |
8 | +generic_data/SimuTemplate/TargetsSimu.xml* | |
14 | 9 | js/lib/ext |
15 | 10 | help/simu |
16 | 11 | help/auto |
17 | 12 | php/bin |
13 | +php/my_config.php | |
18 | 14 | *~ |
19 | 15 | logs/* |
20 | 16 | php/log |
... | ... |
generic_data/Functions/functions.xml
... | ... | @@ -12,16 +12,16 @@ |
12 | 12 | <function name="rms_(,)" args="1" kind="time"> |
13 | 13 | <prompt>input averaging time in secs</prompt> |
14 | 14 | <info_brief>root mean square</info_brief> |
15 | - </function> | |
16 | - <function name="min_(,)" args="1" kind="time"> | |
15 | + </function>--> | |
16 | +<!-- <function name="min_(,)" args="1" kind="time"> | |
17 | 17 | <prompt>input window time in secs</prompt> |
18 | 18 | <info_brief> IDL min() function</info_brief> |
19 | 19 | </function> |
20 | 20 | <function name="max_(,)" args="1" params="1" kind="time"> |
21 | 21 | <prompt>input window time in secs</prompt> |
22 | 22 | <info_brief> IDL max() function</info_brief> |
23 | - </function> | |
24 | - <function name="var_(,)" args="1" kind="time"> | |
23 | + </function>--> | |
24 | +<!-- <function name="var_(,)" args="1" kind="time"> | |
25 | 25 | <prompt>input window time in secs</prompt> |
26 | 26 | <info_brief> IDL variance() function</info_brief> |
27 | 27 | </function> |
... | ... | @@ -121,11 +121,10 @@ |
121 | 121 | <info_brief>Hyperbolic cosine</info_brief> |
122 | 122 | <new_kernel>cosh</new_kernel> |
123 | 123 | </function> |
124 | - <!--<function name="deriv_()" kind="idl"> | |
125 | - <prompt/> | |
126 | - <info_brief>deriv() function with possibly unequal point spacing</info_brief> | |
127 | - <new_kernel>#deriv</new_kernel> | |
128 | - </function>--> | |
124 | + <function name="deriv_()" kind="idl"> | |
125 | + <info_brief>deriv() function with possibly unequal point spacing</info_brief> | |
126 | + <new_kernel>#deriv</new_kernel> | |
127 | + </function> | |
129 | 128 | <function name="exp()" kind="idl"> |
130 | 129 | <info_brief>Natural exponential function</info_brief> |
131 | 130 | <new_kernel>exp</new_kernel> |
... | ... |
generic_data/ParamInfo/.gitignore deleted
generic_data/Plot/DD_Request.res deleted
generic_data/rank.json
1 | 1 | {"Mercury": 1, "Venus": 2, "Heliosphere.NearEarth": 3, "Heliosphere.Remote1AU": 4, |
2 | 2 | "Earth.Magnetosheath": 5, "Earth.Magnetosphere": 5, "Earth": 5, "Earth.Surface": 6, |
3 | -"Mars": 7, "Jupiter": 8, "Ganymede" : 8, "Saturn": 9, "Uranus" : 91, "Neptune" : 92, "Comet" : 93, | |
3 | +"Mars": 7, "Jupiter": 8, "Ganymede" : 8, "Saturn": 9, "Uranus" : 10, "Neptune" : 11, "Comet" : 93, | |
4 | 4 | "Heliosphere" : 99 } |
5 | 5 | \ No newline at end of file |
... | ... |
generic_data/wsdl.location deleted
help/ABC
1 | 1 | <h2><img src="js/resources/images/32x32/fav_amda.png"/> The ABCs of AMDA</h2> |
2 | -<p><h2>A. How to Work with Parameters</h2> | |
2 | +<p><h3>A. How to Work with Parameters</h3> | |
3 | 3 | ... just <b><i>drag</i></b> the Parameter from the WorkSpace Explorer Tree |
4 | -and <b><i>drop</i></b> onto the opened module window. | |
4 | +and <b><i>drop</i></b> onto the opened module window.<br/> | |
5 | +To open module window click one of the icons in the bottom right.<br/> | |
5 | 6 | Parameters are displayed as circles of different colors |
6 | 7 | with gray for <b>scalars</b> <img src="js/resources/images/12x12/circle_grey.png">, |
7 | -green for <b>vectors</b> <img src="js/resources/images/12x12/circle_green.png"> and | |
8 | +green for <b>vectors</b> <img src="js/resources/images/12x12/circle_green.png">, and | |
8 | 9 | orange for <b>spectra</b> <img src="js/resources/images/12x12/circle_orange.png">. |
9 | 10 | </p><br/> |
10 | 11 | <img class="centered" src="help/images/abc_1.png"/> |
11 | -<br/><br/> | |
12 | -<p> | |
13 | -<h2>B. How to Work with Time Tables</h2> | |
14 | -<ul> | |
15 | - <li> To edit the Time Table <b><i>double click</i></b> its name in the WorkSpace Explorer Tree. | |
16 | - <li> To use the Time Table as <b><i>input times</i></b> for AMDA modules <b><i>drag-and-drop</i></b> | |
17 | - it from the WorkSpace Explorer Tree onto the opened module window. | |
18 | - Don't forget to activate <b><i>TimeTable</i></b> mode (radio button). | |
19 | -</ul><br/> | |
12 | +<br/> | |
13 | +Define <b><i>time interval</i></b> in <img src="help/images/time_selector.png"> panel if you are plotting / downloading / dataminining. | |
14 | +<br/> | |
15 | +<hr><p> | |
16 | +<h3>B. How to Work with Time Tables / Catalogs</h3> | |
17 | + ... you may use Time Table / Catalog as <b><i>input times</i></b> in AMDA modules. <br/> Switch | |
18 | + time selector to <b><i>TimeTable or Catalog</i></b> mode by clicking corresponding tab | |
19 | + and <b><i>drag-and-drop</i></b> TimeTable / Catalog from the WorkSpace Explorer Tree on the <b><i>time selection</i></b> panel. | |
20 | +<br/> | |
20 | 21 | <img class="centered" src="help/images/abc_2.png"/> |
21 | 22 | </p><br/> |
22 | -<p> | |
23 | -<h2>C. Context Menu </h2> | |
24 | -<b><i>Right click</i></b> on any of the WorkSpace Explorer Tree <b><i>nodes</i></b> opens the <b><i>Context Menu</i></b>. | |
25 | -<br/>An example for <b><i>TimeTable</i></b> nodes: | |
23 | +... to edit Time Table / Catalog <b><i>double click</i></b> its name in the WorkSpace Explorer Tree. | |
24 | +<hr><p> | |
25 | +<h3>C. Context Menu </h3> | |
26 | +... AMDA module window can be opened by using the <b><i>context menu</i></b> | |
27 | +( <b><i>right click</i></b> on any of the WorkSpace Explorer Tree nodes ). | |
28 | +<br/>An example of the context menus for <b><i>TimeTable</i></b> nodes of different levels: | |
26 | 29 | <br/><br/><img class="centered" src="help/images/tt_1.png"/> |
27 | 30 | <br/> |
28 | 31 | </p> |
... | ... |
help/about
1 | 1 | <h2><img src="js/resources/images/32x32/fav_amda.png"/>Welcome On New AMDA</h2> |
2 | -<i>release version : beta 2.1.1<br/>release date : 2017-06-01</i> | |
2 | +<i>release version : RC 1.0.0<br/>release date : 2018-06-01</i> | |
3 | 3 | <ul> |
4 | 4 | <li><img src="js/resources/images/16x16/view_tree.png" width=24/> WorkSpace Explorer |
5 | 5 | <li>From now Amda DataBase parameter |
6 | 6 | tree is constructed automatically from Amda Spase Registry. Info <img src="js/resources/images/16x16/info_mini.png"/> |
7 | 7 | is generated for all Mission/Instrument/DataSet nodes. |
8 | - <li> No access to Remote DataBases Observations in the current version. | |
9 | 8 | <hr> |
10 | 9 | <li><img src="js/resources/images/64x64/edit.png" width=24/> Create/Modify Parameter <br/> |
11 | 10 | <li>Interface isn't changed but all the calculations are made by new kernel |
... | ... | @@ -32,9 +31,7 @@ |
32 | 31 | <hr> |
33 | 32 | <li><img src="js/resources/images/64x64/search.png" width=24/> Data Mining <br/> |
34 | 33 | <li>Interface isn't changed but all the calculations are made by new kernel |
35 | - <li>Not all the functions are implemeneted - use <i>Simple Math Functions</i> for tests | |
36 | - <li>Sometimes there is no parameter arguments description file - and system throws an exception. | |
37 | - Please note such cases | |
34 | + <li>Not all the functions are implemeneted - use <i>Simple Math Functions</i> for tests | |
38 | 35 | <hr> |
39 | 36 | <li><img src="js/resources/images/64x64/download_manager.png" width=24/> Download (Data)<br/> |
40 | 37 | <li> Temporary limited time formats |
... | ... | @@ -43,4 +40,4 @@ |
43 | 40 | <li> New option <img src="js/resources/images/16x16/edit.png"/> selecting component of the array |
44 | 41 | <hr> |
45 | 42 | <li><img src="js/resources/images/64x64/interop.png" width=24/>Interoperability |
46 | - <li> No access to Remote Data Base (except IMPEX!) in the current version. | |
43 | + <li> EPNTAP | |
... | ... |
help/about.html deleted
... | ... | @@ -1,121 +0,0 @@ |
1 | -<html xmlns="http://www.w3.org/TR/REC-html40"><head><title>About AMDA</title> | |
2 | - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | |
3 | -<title>AMDA About</title> | |
4 | -<meta name="keywords" content="" /> | |
5 | -<meta name="description" content="" /> | |
6 | -<link href="../js/resources/css/styles.css" rel="stylesheet" type="text/css" media="screen" /> | |
7 | -<link rel="icon" href="../favicon.ico" type="image/x-icon"> | |
8 | -<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"> | |
9 | -</head> | |
10 | - | |
11 | -<body> | |
12 | -<div id="content"> | |
13 | -<div id="back"> | |
14 | -<div style="clear: both;"> </div> | |
15 | -<div id="main"> | |
16 | - <div id="right"> | |
17 | - <h3>AMDA DOCS</h3> | |
18 | - <div class="title"> | |
19 | - <ul> | |
20 | - <li>Presentations | |
21 | - <ul> | |
22 | - <li> | |
23 | - <a href="http://cdpp.cesr.fr/index.php?option=com_content&task=view&id=26&Itemid=66"> | |
24 | - CDPP/AMDA and the Virtual Observatories</a></li> | |
25 | - <li> | |
26 | - <a href="http://cdpp.cesr.fr/index.php?option=com_content&task=view&id=42&Itemid=66">Science with CDPP/AMDA</a></li> | |
27 | - </ul></li> | |
28 | - <li>Publications | |
29 | - <ul> | |
30 | - <li> <a href="http://cdpp.cesr.fr/index.php?option=com_content&task=view&id=25&Itemid=66"> | |
31 | - CDPP/AMDA and the Virtual Observatories</a></li> | |
32 | - <li><a href="http://cdpp.cesr.fr/index.php?option=com_content&task=view&id=43&Itemid=66"> | |
33 | - Science with CDPP/AMDA</a></li> | |
34 | - </ul></li> | |
35 | - </ul> | |
36 | - </div> | |
37 | - <h3>AMDA THANKS</h3> | |
38 | - <div class="title"> | |
39 | - <ul> | |
40 | - <li> Data Centers | |
41 | - <ul> | |
42 | - <li><a title="Institut de Recherche en Astrophysique et Planรฉtologie" href="http://www.irap.omp.eu/">IRAP</a> | |
43 | - <li><a title="Coordinated Data Analysis Web, Goddard" href="http://cdaweb.gsfc.nasa.gov/">CDAWeb</a> | |
44 | - <li><a title="Planetary Data System" href="http://pds.jpl.nasa.gov/">PDS</a> | |
45 | - <li><a href="http://omniweb.gsfc.nasa.gov/">OMNIWeb</a> | |
46 | - <li><a title="World Data Center for Magnetism, Kyoto" href="http://swdcwww.kugi.kyoto-u.ac.jp/">WDC, Kyoto</a> | |
47 | - <li><a title="MAPS Key Parameter Database, IRAP/OMP, Toulouse" href="http://mapskp.cesr.fr/">MAPSKP</a> | |
48 | - <li><a href="http://themis.ssl.berkeley.edu/index.shtml">THEMIS</a> | |
49 | - <li><a href="http://csds-fr.cnes.fr:8082/cdms/">French Cluster Data Center</a> | |
50 | - <li><a title="Cluster Active Archive" href="http://caa.estec.esa.int/caa/ ">CAA</a> | |
51 | - <li><a title="International Service of Geomagnetic Indices" | |
52 | - href="http://isgi.cetp.ipsl.fr">IGSI/CETP</a> | |
53 | - <li><a title="Danish Meteorological Institute" | |
54 | - href="http://www.dmi.dk">DMI</a> | |
55 | - <li><a href="http://www.lesia.obspm.fr/kronos/">LESIA/OBSPM</a> | |
56 | - <li><a title="UK Solar System Data Centre" href="http://www.ukssdc.ac.uk/">UKSSDC</a> | |
57 | - <li><a title="STEREO science center" href="http://stereo-ssc.nascom.nasa.gov/">SSC</a> | |
58 | - </ul> | |
59 | - </li> | |
60 | - </ul> | |
61 | - </div> | |
62 | - | |
63 | - | |
64 | - </div> | |
65 | -<div id="left"> | |
66 | - <h2>AMDA Intro</h2> | |
67 | -<p> | |
68 | -The plasma objects studied in space physics consist of gigantic systems characterised by | |
69 | -multiscale dynamics and fast long range couplings between key regions. For | |
70 | -studying such systems, it is necessary to perform integrated multi-point/multi-instrument | |
71 | -analysis in case studies and statistical studies as well. The ISTP program, the | |
72 | -CLUSTER, THEMIS and MMS missions have been defined for facing this requirement. | |
73 | -</p> | |
74 | -<p>Integrated | |
75 | -analysis of multi-point and multi-instrument data means that the researcher has | |
76 | -to: | |
77 | -</p><ul> | |
78 | - <li> find interesting cases</li> | |
79 | - <li> when some cases have been found, find and extract the data of interest</li> | |
80 | - <li> when the data are collected, treat them (formatting, bad point filtering, | |
81 | - resampling, data merging)</li> | |
82 | - <li> visualise combined (i.e. coming from various sets) data</li> | |
83 | - <li>perform calculation and apply various | |
84 | -specific tools on the data | |
85 | -</li></ul> | |
86 | - | |
87 | -<p> Depending on the heterogeneity of the data and the dispersion of their sources, | |
88 | - the scientists can spend a lot of energy and time just for searching, finding, | |
89 | - treating and preparing the data before starting scientific analysis. In order | |
90 | - to help the users to faster reach the data analysis and interpretation step, | |
91 | - the CDPP is developing a service with the following goals: </p> | |
92 | -<p> The service provides functionalities for </p> | |
93 | -<ul> | |
94 | - <li>performing automated search of events, producing time-tables. This tool scans | |
95 | - the content of the data and automatically test mathematical criteria edited | |
96 | - by the user</li> | |
97 | - <li>performing semi-automated search of events, producing time-tables. This | |
98 | - tool allows the user to browse the data she/he selected by sequentially producing | |
99 | - a figure he has predefined</li> | |
100 | - <li>performing automated and semi-automated characterisation of events, producing | |
101 | - catalogues (time-tables + extracted parameters)</li> | |
102 | - <li>extracting sub-database from an input time-table</li> | |
103 | - <li>performing basic data treatment (formatting, bad point filtering, re-sampling, | |
104 | - data merging, ) in order to provide to the user data ready to use with her/his | |
105 | - favourite software</li> | |
106 | -</ul> | |
107 | -<p> These tools can be applied on large amount of data (including | |
108 | - multi-mission/multi-instrument datasets) in a transparent way by the users. | |
109 | -</p> | |
110 | -<p> The data are either physically resident in the AMDA database | |
111 | - or remotely accessed from remote sites via web-services (CDAWEB, MAPSKP). </p> | |
112 | -<p> The service can be reached and used from other sites according | |
113 | - to the Virtual Observatory paradigm. </p> | |
114 | -<hr> | |
115 | -<p>AMDA is developed on the basis of an existing DD SYSTEM (Andrey Fedorov, IRAP).</p> | |
116 | -<br/><br/> | |
117 | -<p> <a href="..">AMDA Home =></a></p> | |
118 | -</div> | |
119 | -</div> | |
120 | -</div> | |
121 | -</body></html> |
help/advancedFeatures deleted
... | ... | @@ -1,22 +0,0 @@ |
1 | -<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Additional Features</h2> | |
2 | -<p> | |
3 | -<b><i>Several Parameters on one Panel</i></b> | |
4 | -</p> | |
5 | -<p> | |
6 | -To plot several parameter on one panel just drop them on the same panel in the Plot Form. | |
7 | -</p><br/> | |
8 | -<img class="centered" src="help/images/plot_18.png"/> | |
9 | -<br/> | |
10 | -<p> | |
11 | -<b><i>AutoScale</i> TBD</b> | |
12 | -</p> | |
13 | -<p> | |
14 | -<b><i>AutoLayout</i> TBD</b> | |
15 | -</p> | |
16 | -<br/> | |
17 | -</p> | |
18 | -<p> | |
19 | -<b><i>Get Data</i> TBD</b> | |
20 | -</p> | |
21 | -<br/> | |
22 | -<br/> |
... | ... | @@ -0,0 +1,17 @@ |
1 | +<h2><img src="js/resources/images/16x16/view_tree.png" style="margin: 0px 10px 0px 0px;"/>Resources Tree: Catalogs</h2> | |
2 | +<p> | |
3 | +There are two different <b><i>Catalogs</i></b> types in AMDA - common (<i>shared</i>) and private (<i>my</i>). | |
4 | +<b><i>My Catalogs</i></b> are visible to the owner only while <b><i>Shared Catalogs</i></b> are open | |
5 | +to the whole community.</p><br/> | |
6 | +<p> | |
7 | +Catalogs can be generated by <b><i>Statistics module</i></b>, or you may upload them. | |
8 | +All your catalogs are stored in your WS and | |
9 | +<b>can be used as input times</b> for AMDA modules. | |
10 | +</p><br/> | |
11 | +<p>To access the Catalogs context menu <b>right click</b> the node in the Catalogs subtree. | |
12 | +Note that menu depends on the type of the node clicked (root, folder, leaf..).<br/> | |
13 | +<b><i>Edit Catalog</i></b> context menu item (or <b>double click</b> the catalog name) opens <b><i>Manage Catalogs</i></b> module. | |
14 | +</p><p> | |
15 | +<img class="centered" src="help/images/catalog_1.png"/> | |
16 | +</p> | |
17 | + | |
0 | 18 | \ No newline at end of file |
... | ... |
help/content.json
... | ... | @@ -16,7 +16,7 @@ children: [ |
16 | 16 | id: 'parametersTree', |
17 | 17 | leaf:true |
18 | 18 | },{ |
19 | - text:'Resources: Filtering', | |
19 | + text:'Resources: Filtering (TBU)', | |
20 | 20 | id: 'filters', |
21 | 21 | leaf:true |
22 | 22 | },{ |
... | ... | @@ -24,6 +24,11 @@ children: [ |
24 | 24 | id: 'timetables', |
25 | 25 | leaf:true |
26 | 26 | },{ |
27 | + text:'Resources: Catalogs', | |
28 | + id: 'catalogs', | |
29 | + leaf:true | |
30 | + }, | |
31 | + { | |
27 | 32 | text:'Operations', |
28 | 33 | id: 'operationsHelp', |
29 | 34 | leaf:true |
... | ... | @@ -43,7 +48,7 @@ children: [ |
43 | 48 | id: 'mydataparameter', |
44 | 49 | leaf:true |
45 | 50 | },{ |
46 | - text:'Aliases', | |
51 | + text:'Aliases (TBU)', | |
47 | 52 | id: 'aliases', |
48 | 53 | leaf:true |
49 | 54 | }] |
... | ... | @@ -58,23 +63,51 @@ children: [ |
58 | 63 | id: 'plotSettings', |
59 | 64 | leaf:true |
60 | 65 | },{ |
61 | - text:'Plot Intro', | |
62 | - id: 'panelSettings', | |
66 | + text:'Plot Briefly', | |
67 | + id: 'plotSimplifiedView', | |
63 | 68 | leaf:true |
69 | + }, | |
70 | + { | |
71 | + text:'Plot In Details', | |
72 | + children:[{ | |
73 | + text:'Plot Objects', | |
74 | + id: 'plotObjects', | |
75 | + leaf:true | |
76 | + },{ | |
77 | + text:'Plot Objects : Page', | |
78 | + id: 'plotPage', | |
79 | + leaf:true | |
80 | + },{ | |
81 | + text:'Plot Objects : Layout (TBD)', | |
82 | + id: 'plotLayout', | |
83 | + leaf:true | |
84 | + },{ | |
85 | + text:'Plot Objects : Panel (TBD)', | |
86 | + id: 'plotPanel', | |
87 | + leaf:true | |
88 | + },{ | |
89 | + text:'Plot Objects : Axis (TBD)', | |
90 | + id: 'plotAxis', | |
91 | + leaf:true | |
92 | + },{ | |
93 | + text:'Plot Objects : Additional Objects (TBD)', | |
94 | + id: 'plotAdditional', | |
95 | + leaf:true | |
96 | + },{ | |
97 | + text:'Plot Objects : Parameter (TBD)', | |
98 | + id: 'plotParameter', | |
99 | + leaf:true | |
100 | + }] | |
64 | 101 | },{ |
65 | 102 | text:'Interactive Plot Session', |
66 | 103 | id: 'interSession', |
67 | 104 | leaf:true |
68 | 105 | },{ |
69 | - text:'Additional Features', | |
70 | - id: 'advancedFeatures', | |
71 | - leaf:true | |
72 | - },{ | |
73 | - text:'MultiPlot Mode', | |
106 | + text:'MultiPlot Mode (TBD) ', | |
74 | 107 | id: 'multiPlot', |
75 | 108 | leaf:true |
76 | 109 | },{ |
77 | - text:'Access to Hubble Images', | |
110 | + text:'Access to Hubble Images (TBD)', | |
78 | 111 | id: 'hubbleImages', |
79 | 112 | leaf:true |
80 | 113 | }] |
... | ... | @@ -85,7 +118,7 @@ children: [ |
85 | 118 | id: 'dataminingHelp', |
86 | 119 | leaf:true |
87 | 120 | },{ |
88 | - text:'Using Functions', | |
121 | + text:'Using Functions (TBD)', | |
89 | 122 | id: 'functionsHelp', |
90 | 123 | leaf:true |
91 | 124 | }] |
... | ... | @@ -96,37 +129,57 @@ children: [ |
96 | 129 | id: 'downloadDataHelp', |
97 | 130 | leaf:true |
98 | 131 | },{ |
99 | - text:'TimeTables', | |
132 | + text:'TimeTables / Catalogs', | |
100 | 133 | id: 'downloadTTHelp', |
101 | 134 | leaf:true |
102 | 135 | }] |
103 | 136 | },{ |
104 | 137 | text:'Data Uploading', |
105 | 138 | children:[{ |
106 | - text:'Data', | |
139 | + text:'Data (TBU)', | |
107 | 140 | id: 'uploadDataHelp', |
108 | 141 | leaf:true |
109 | 142 | },{ |
110 | - text:'TimeTables', | |
143 | + text:'TimeTables (TBU)', | |
111 | 144 | id: 'uploadTTHelp', |
112 | 145 | leaf:true |
146 | + },{ | |
147 | + text:'Catalogs (TBD)', | |
148 | + id: 'uploadCatHelp', | |
149 | + leaf:true | |
150 | + }] | |
151 | +},{ | |
152 | + text:'Catalogs', | |
153 | + children:[{ | |
154 | + text:'Generating Catalogs in AMDA (TBD)', | |
155 | + id: 'statisticsHelp', | |
156 | + leaf:true | |
157 | + },{ | |
158 | + text:'Managing Catalogs (TBD)', | |
159 | + id: 'catalogHelp', | |
160 | + leaf:true | |
161 | + },{ | |
162 | + text:'Visualizing Catalogs (TBD)', | |
163 | + id: 'visuHelp', | |
164 | + leaf:true | |
113 | 165 | }] |
114 | 166 | },{ |
115 | 167 | text:'Time Tables', |
116 | 168 | children:[{ |
117 | - text:'Managing Time Tables', | |
169 | + text:'Managing Time Tables (TBU)', | |
118 | 170 | id: 'timetableHelp', |
119 | 171 | leaf:true |
120 | 172 | },{ |
121 | - text:'Operations on Time Tables', | |
173 | + text:'Operations on Time Tables (TBU)', | |
122 | 174 | id: 'ttOperationsHelp', |
123 | 175 | leaf:true |
124 | 176 | },{ |
125 | - text:'Shared Time Tables', | |
177 | + text:'Shared Time Tables (TBU)', | |
126 | 178 | id: 'ttShared', |
127 | 179 | leaf:true |
128 | 180 | }] |
129 | -},{ | |
181 | +}, | |
182 | +{ | |
130 | 183 | text:'Working with SAMP', |
131 | 184 | children:[ |
132 | 185 | { |
... | ... | @@ -135,21 +188,25 @@ children: [ |
135 | 188 | leaf:true |
136 | 189 | }, |
137 | 190 | { |
138 | - text:'Connecting to SAMP Hub', | |
191 | + text:'Connecting to SAMP Hub (TBU)', | |
139 | 192 | id: 'SampHelp', |
140 | 193 | leaf:true |
141 | 194 | }] |
142 | 195 | },{ |
143 | 196 | text:'Remote Data', |
144 | 197 | children:[{ |
145 | - text:'Remote Data Centers', | |
198 | + text:'Remote Data Centers (TBU)', | |
146 | 199 | id: 'remoteIntro', |
147 | 200 | leaf:true |
148 | 201 | },{ |
149 | - text:'Remote Centers: Adding Data', | |
202 | + text:'Remote Centers: Adding Data (TBU)', | |
150 | 203 | id: 'RemoteDataHelp', |
151 | 204 | leaf:true |
205 | + }] | |
206 | +},{ | |
207 | + text:'EPN-TAP (TBD)', | |
208 | + id: 'EPNTAP', | |
209 | + leaf:true | |
152 | 210 | } |
153 | - ] | |
154 | -}] | |
211 | +] | |
155 | 212 | } |
... | ... |
help/dataminingHelp
1 | -<h2><img src="js/resources/images/16x16/search.png" style="margin: 0px 10px 0px 0px;"/>Data Mining</h2> | |
1 | +<h2><img src="js/resources/images/16x16/search.png" style="margin: 0px 10px 0px 0px;"/>Data Mining Module</h2> | |
2 | 2 | <p> |
3 | -DataMining module is searching in data for time intervals when a condition on parameters (defined by user) | |
4 | -is valid.<br/><br/> | |
5 | -<b>1 : </b>To construct a condition <b><i>drag</i></b> the parameter[s] from the Parameter Tree and <b><i>drop</i></b> | |
3 | +DataMining module is searching data for time intervals when a condition on parameters (defined by yourself) | |
4 | +is valid.<br/><hr> | |
5 | +<b>1. </b>To construct a condition <b><i>drag</i></b> the parameter[s] from the Parameter Tree and <b><i>drop</i></b> | |
6 | 6 | it onto the <b><i>Data Mining Condition</i></b> area.<br/> |
7 | 7 | <img class="centered" src="help/images/mining1.png"/><br/> |
8 | -</p> | |
8 | +</p><hr> | |
9 | 9 | <p> |
10 | -<b>2 : </b>While constructing you may use different components from the <b><i>Tools For Condition Construction</i></b> - | |
11 | -for example - <b><i>Constants</i></b>:<br/><br/> | |
10 | +<b>2. </b>While constructing you may use <b><i>Tools For Condition Construction</i></b> - | |
11 | +for example - <b><i>Functions</i></b>:<br/><br/> | |
12 | 12 | <img class="centered" src="help/images/derived2.png"><br/> |
13 | -</p> | |
13 | +</p><hr> | |
14 | 14 | <p> |
15 | -<b>3 : </b>To combine and compare different AMDA parameters which possibly have different | |
16 | -sampling times you have to specify the condition <b><i>Sampling Time Step</i></b>.<br/> | |
15 | +<b>3. </b>To combine and compare different AMDA parameters which possibly have different | |
16 | +sampling times you have to specify <b><i>Sampling Time Step</i></b>.<br/> | |
17 | 17 | </p><p> |
18 | 18 | <img align="left" src="help/images/mining2.png" style="margin: 0px 10px 0px 0px;"/> |
19 | 19 | Depending on their original sampling, AMDA parameters will be averaged or interpolated to obtain |
20 | 20 | a condition evaluated at a <b><i>Sampling Time Step</i></b> resolution. Before evaluate the expression |
21 | 21 | all the parameters are resampled and after that the expression is calculated. |
22 | - </p> | |
22 | +</p> | |
23 | 23 | <p> |
24 | 24 | You may also put <b><i>Data Gap</i></b> value. It is expressed in the parameter 'sampling |
25 | 25 | times' and defines gaps threshold. If data is absent for time interval greater than this threshold |
26 | 26 | the interval is treated as 'gap', otherwise the interval is filled with the interpolated data. |
27 | 27 | </p> |
28 | 28 | <p> |
29 | -Parameter' <i>Sampling Time</i> as well as <i>Global Start - Stop Time Interval</i> | |
30 | -are displayed in popup window shown when the mouse is over the parameter name in Parameters tree. | |
31 | -</p><br/> | |
29 | +Parameter <i>Sampling Time</i> as well as <i>Global Start - Stop Time Interval</i> | |
30 | +are displayed in popup window shown when the mouse is over the corresponding dataset of the WorkSpace Explorer Parameters subtree. | |
31 | +</p><hr> | |
32 | 32 | <p> |
33 | -<img align="left" src="help/images/mining3.png" style="margin: 0px 10px 0px 0px;"/> | |
34 | -<b>4 : </b>Data Mining could be done either for a single time interval | |
33 | +<img align="left" src="help/images/mining3.png" style="margin: 10px 10px 0px 0px;"/> | |
34 | +<b>4. </b>Data Mining could be done either for a single time interval | |
35 | 35 | (<b><i>Start Time</i></b> and <b><i>Time Interval</i></b> should be defined) |
36 | 36 | or for a set of time intervals from one or several <b><i>Time Tables or Catalogs</i></b>. |
37 | -</p><br/> | |
37 | +</p><br/><hr> | |
38 | 38 | <p> |
39 | -<b>5 : </b>Condition may be saved in your Workspace for next use. | |
39 | +<b>5. </b>Condition may be saved in your Workspace for next use. | |
40 | 40 | Just give the name to a condition (<b><i>Request Name</i></b>) and |
41 | 41 | click the <b><i>Save Request</i></b> button. Your condition is added to the <b><i>DataMining</i></b> |
42 | -tree of the Workspace Explorer, <b><i>Operations</i></b> tab. | |
42 | +subtree of the Workspace Explorer, <b><i>Operations</i></b> tab. | |
43 | 43 | <img class="centered" src="help/images/mining4.png"/><br/> |
44 | -</p> | |
44 | +</p><hr> | |
45 | 45 | <p> |
46 | -<img align="left" src="help/images/mining6.png" style="margin: 0px 10px 0px 0px;"/><br/> | |
47 | -<b>6 : </b>Double clicking on condition name in the <b><i>DataMining</i></b> tree | |
46 | +<img align="left" src="help/images/mining6.png" style="margin: 10px 10px 0px 0px;"/><br/> | |
47 | +<b>6. </b>Double clicking on condition name in the <b><i>DataMining</i></b> tree | |
48 | 48 | (Workspace Explorer, <b><i>Operations</i></b> tab) or selecting <b><i>DataMining By Request</i></b> |
49 | 49 | from the context menu opens the DataMining module filled with the condition content. |
50 | 50 | </p> |
51 | 51 | <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/> |
52 | -<p> | |
53 | -<b>7 : </b> Data Mining produces two XML tables (Time Table and Gaps Time Table) accessible from the <b><i>Results</i></b> window : | |
52 | +<hr><p> | |
53 | +<b>7. </b> Data Mining produces two XML tables (Time Table and Gaps Time Table) accessible from the <b><i>Results</i></b> window : | |
54 | 54 | <img class="centered" src="help/images/mining8.png"><br/><br/> |
55 | 55 | </p> |
56 | -<p> | |
57 | -<img align="right" src="help/images/mining9.png" style="margin: 0px 0px 0px 10px;"/> | |
58 | -<b>8 : </b> <b><i>Results</i></b> window may be always opened by selecting <b><i>Show Result</i></b> from context menu opened on the right click at the corresponding node of the | |
56 | +<hr><p> | |
57 | +<img align="right" src="help/images/mining9.png" style="margin: 10px 0px 0px 10px;"/> | |
58 | +<b>8. </b> <b><i>Results</i></b> window may be always opened by selecting <b><i>Show Result</i></b> from context menu opened on the | |
59 | +right click the corresponding node of the | |
59 | 60 | FinishedJobs / Results, DataMining tree of the Workspace Explorer, <b><i>Jobs</i></b> tab. |
60 | 61 | </p> |
... | ... |
help/downloadDataHelp
1 | -<h2><img src="js/resources/images/16x16/download_manager.png" style="margin: 0px 10px 0px 0px;"/> Get Data </h2> | |
1 | +<h2><img src="js/resources/images/16x16/download_manager.png" style="margin: 0px 10px 0px 0px;"/> Get Data : DownloadData Module</h2> | |
2 | +<h3>1. Download settings</h3> | |
2 | 3 | <p>To download a parameter, <b><i>drag</i></b> it from the Parameter tree and <b><i>drop</i></b> onto the |
3 | -<b><i>Download</i></b> panel.</br></br> | |
4 | -<img align="left" SRC="help/images/downloadnew.png" style="margin: 0px 15px 0px 0px;"/> | |
5 | -</p> | |
6 | -<p> | |
7 | -There are three main downloading options:</br> | |
8 | -1. <b><i>One File Per Param/Interval</i></b></br> | |
4 | +<b><i>Download</i></b> panel.</br> | |
5 | +There are three main downloading options (<b><i>File Structure</i></b>) : </br> | |
6 | +<img align="right" SRC="help/images/downloadnew.png" style="margin: 10px 10px 15px 10px;"/> | |
7 | +</br><b><i>1. One File Per Param/Interval</i></b></br> | |
9 | 8 | Each parameter and each time interval from time table (if you download data for intervals from a Time Table) |
10 | 9 | is output into separate file. <br/> |
11 | -Sampling time = original parameter sampling time. <br/> | |
12 | -Note that <b><i>Sampling Time step</i></b> and <b><i>use first parameter as reference for sampling</i></b> are not available for this type of data download.</br> | |
13 | -2. <b><i>All in One File</i></b></br> | |
14 | -All parameters are downloaded into one file.</br> | |
15 | -3. <b><i>One File Per Time interval</i></b></br> | |
16 | -All parameters you select are downloaded into one file for each time interval.</br> | |
17 | -In case 2 and 3 you have to define common <b><i>Sampling Time step</i></b>, you can <b><i>use first parameter as reference for sampling</i></b></br>You may give your own <b><i>Output File Prefix</i></b>.</br></br></br> | |
18 | - | |
19 | -You may write <b><i>header</i></b> into Data File or into a separate File.</br> | |
20 | -You may choose the File Format (<b><i>ASCII</i></b> or <b><i>VOTable</i></b>).</br> | |
21 | -You may <b><i>zip</i></b> or <b><i>tar+gzip</i></b> those files.<br/></br> | |
22 | -<b>Time</b> can be selected by <b>Interval</b> or by <b>Time Table</b></br> | |
23 | -To select a time table, <b><i>drag</i></b> it from the Time Tables tree and <b><i>drop</i></b> onto the Time Table panel</br></br> | |
24 | -<IMG SRC="help/images/timeTT.png"/></br></br> | |
25 | - | |
26 | -<h3> Results of Download </h3> | |
27 | -After clicking on the <IMG SRC="help/images/download_button.png" align="top" /> button, if your job takes a long time the job is launched in batch</br></br> | |
28 | -<IMG SRC="help/images/job.png" width="502" height="98"/></br></br> | |
29 | -0therwise you can download immediately the result (in ASCII or VOTable)</br></br> | |
30 | -<IMG SRC="help/images/result.png"/></br></br> | |
31 | - | |
32 | -<h3> Send via SAMP </h3> | |
33 | -You can send the result of your download to clients who are connected to the SAMP hub</br></br> | |
34 | -<IMG SRC="help/images/SampSend.png" /> | |
10 | +Sampling time = original parameter sampling time.<br/> | |
11 | +Note that <b><i>Sampling Time</i></b> and <b><i>Use first parameter as reference for sampling</i></b> options | |
12 | +are not available for this type of data download.</br><br/> | |
13 | +<b><i>2. All in One File</i></b></br> | |
14 | +All parameters are downloaded into one file.</br></br> | |
15 | +<b><i>3. One File Per Time interval</i></b></br> | |
16 | +All parameters you select are downloaded into one file for each time interval.</br></br> | |
17 | +In case 2) and 3) you have to define common <b><i>Sampling Time</i></b>, and you may | |
18 | +<b><i>Use first parameter as reference for sampling</i></b>. | |
19 | +<hr> | |
20 | +<h3>2. Time Selection</h3> | |
21 | + You may use Time Table / Catalog as <b><i>input times</i></b>. <br/> Switch | |
22 | + time selector to <b><i>TimeTable or Catalog</i></b> mode by clicking corresponding tab | |
23 | + and <b><i>drag-and-drop</i></b> TimeTable / Catalog from the WorkSpace Explorer Tree on the <b><i>time selection</i></b> panel.</br> | |
24 | +<br/> <img class="centered" src="help/images/timeTT.png"/></br></br> | |
25 | +<hr> | |
26 | +<h3>3. Results of Download </h3> | |
27 | +If your downloading takes a long time it is forked into <b><i>a batch mode</i></b>. | |
28 | +You receive an info message :<br/> | |
29 | +<br/><img class="centered" src="help/images/job.png" /> | |
30 | +<br/> | |
31 | +0therwise you can immediately download your result file :<br/> | |
32 | +<br/><img class="centered" src="help/images/result.png"/></br></br> | |
33 | +<hr> | |
34 | +<h3>4. Send via SAMP </h3> | |
35 | +You can send the result of your download to clients who are connected to the SAMP hub<br/> | |
36 | +<br/><img class="centered" src="help/images/SampSend.png"/> | |
... | ... |
help/downloadTTHelp
1 | -<h2><img src="js/resources/images/16x16/download_manager.png" style="margin: 0px 10px 0px 0px;"/> Get Time Table</h2> | |
2 | -To download a time table <b><i>drag</i></b> it from the Time Tables tree and <b><i>drop</i></b> onto the Download | |
3 | -Time Table panel.</br></br> | |
4 | -<img class="centered" src="help/images/ttdown.png"/><br/><br/> | |
5 | -<p><img align="left" src="help/images/optionDownloadTT.png" style="margin: 0px 15px 0px 0px;"/> | |
6 | -You can choose the Time Format and the File Format (<b>plain text</b> or <b>VOTable</b>).</br> | |
7 | -You may <b>zip</b> or <b> tar+gzip</b> those files. | |
8 | -</p><br/> | |
9 | 1 | \ No newline at end of file |
2 | +<h2><img src="js/resources/images/16x16/download_manager.png" style="margin: 0px 10px 0px 0px;"/>Get Time Table : DownloadData Module</h2> | |
3 | +To download a Time Table / Catalog <b><i>drag</i></b> it | |
4 | +from the corresponding Workspace Explorer subtree and <b><i>drop</i></b> onto the | |
5 | +TimeTable / Catalog panel of DownloadData module.</br> | |
6 | + | |
7 | +You may select the Time Format and the File Format (<b><i>plain text</i></b> or <b><i>VOTable</i></b>) | |
8 | +and <b><i>zip</i></b> or <b><i>tar+gzip</i></b> those files. | |
9 | +</p><img align="left" src="help/images/ttdown.png"/><br/><br/> | |
10 | 10 | \ No newline at end of file |
... | ... |
help/images/SampNo.png
help/images/abc_1.png
33.9 KB
help/images/derived.png deleted
10.6 KB
help/images/derived1.png
help/images/derived2.png
help/images/derived3.png
help/images/jobs_1.png
help/images/jobs_2.png
help/images/mining1.png
33.7 KB
21.1 KB
4.04 KB
10.5 KB
10.2 KB
17.8 KB
help/images/params.png
help/images/paramtree.png
19.5 KB
17.5 KB
36.1 KB
31.6 KB
15.9 KB
26.9 KB
27.3 KB
41.8 KB
35.7 KB
27 KB
32.6 KB
33.7 KB
help/images/plot_1.png deleted
25.6 KB
help/images/plot_10.png deleted
14.5 KB
help/images/plot_11.png deleted
27 KB
help/images/plot_15.png deleted
9.06 KB
help/images/plot_16.png deleted
50.2 KB
help/images/plot_17.png deleted
14.2 KB
help/images/plot_18.png deleted
58.6 KB
help/images/plot_2.png deleted
14.3 KB
help/images/plot_3.png
help/images/plot_5.png deleted
8.51 KB
help/images/plot_6.png deleted
15.4 KB
help/images/plot_7.png deleted
5.79 KB
help/images/plot_8.png deleted
43.9 KB
help/images/plot_9.png deleted
14.3 KB
19.2 KB
help/images/plot_type_1.png deleted
6.66 KB
help/images/plot_type_3.png deleted
4.65 KB
help/images/resourcesTree.png
help/images/resourcestop.png
6.73 KB
11 KB
1.03 KB
help/images/tt_1.png
help/images/ttdown.png
54.5 KB
help/images/uploadfile_1.png
44.6 KB
help/images/uploadtt_1.png
help/interSession
1 | -<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Interactive Plot Session</h2> | |
1 | +<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Plot Manager : Interactive Plot Session</h2> | |
2 | 2 | <p> |
3 | 3 | PNG plot generates screen output and opens an interactive session. Using buttons/slider |
4 | -you can 1) navigate back and forth in time, 2) resize image, 3) select time interval for its zooming or | |
5 | -storing in time table, zoom on Y Left Axis 4) extend/shift time interval, 5) save plot on your disk, 6) link the plot with other plots, 7) access to Hubble Space Telescope images. | |
4 | +you can | |
5 | +<ol> | |
6 | +<li> navigate back and forth in time, <li> resize image, <li> select time interval for its zooming or | |
7 | +storing in time table, zoom on Y Left Axis (right click on image to open menu), <li> extend/shift time interval (right click on image to open menu), <li> save plot on your disk (right click on image to open menu), <li> link the plot with other plots, | |
8 | +<li> access to Hubble Space Telescope images. | |
9 | +</ol> | |
6 | 10 | </p> |
7 | 11 | <br/> |
8 | 12 | <img class="centered" src="help/images/plot_12.png"/> |
9 | 13 | <br/> |
10 | -<p> | |
11 | -In case of Time Table input you navigate over Time Table intervals. | |
14 | +<hr><p> | |
15 | +In case of Time Table / Catalog input you navigate over Time Table intervals. | |
12 | 16 | </p> |
13 | 17 | <br/> |
14 | 18 | <img class="centered" src="help/images/plot_13.png"/> |
15 | 19 | <br/> |
16 | -<p> | |
17 | -<b><i>Zoom In Time Interval</i></b> | |
20 | +<hr><p> | |
21 | +<b><i>Extend/Shift (4)</i></b>. Time extention/shift value can be positive (interval extention, positive time shift) | |
22 | +or negative (interval shrinking, negative time shift). | |
18 | 23 | </p> |
24 | +<hr><p> | |
25 | +You find the description of (6) Linked to Multi Plot Mode in the <i>MultiPlot Mode</i> section and (7) access to Hubble Space Telescope images in the <i>Access to Hubble Images</i> section. | |
26 | +</p> | |
27 | +<hr> | |
19 | 28 | <p> |
29 | +<img align="left" style="margin: 0px 10px 10px 10px;" src="help/images/plot_14.png"/> | |
30 | +<b><i>Zoom In Time Interval (3)</i></b><br/> | |
20 | 31 | After right clicking <i>Zoom On Time Axis</i> in the context menu |
21 | 32 | select interval of interest by clicking image. |
22 | -You can either 1) apply/undo zoom or 2) insert selected interval into new or existing time table. | |
33 | +You can either | |
34 | +<ol> | |
35 | +<li> apply/undo zoom or | |
36 | +<li> insert selected interval into new or existing time table. | |
23 | 37 | Time Table name is to be typed (or dragged/dropped) in the <i>Time Table Name</i> field. |
24 | -</p> | |
25 | -<br/> | |
26 | -<img class="centered" src="help/images/plot_14.png"/> | |
38 | +</ol> | |
27 | 39 | <br/> |
28 | -<p> | |
29 | -<b><i>Extend/Shift</i></b>. Time extention/shift value can be positive (interval extention, positive time shift) | |
30 | -or negative (interval shrinking, negative time shift). | |
31 | -</p> | |
32 | -<p> | |
33 | -You find the description of 6) Linked to Multi Plot Mode in the <i>MultiPlot Mode</i> section and 7) access to Hubble Space Telescope images in the <i>Access to Hubble Images</i> section. | |
34 | -</p> | |
35 | -<br/> | |
... | ... |
help/jobsHelp
1 | 1 | <h2><img src="js/resources/images/16x16/view_tree.png" style="margin: 0px 10px 0px 0px;"/>WorkSpace Explorer : Jobs Tree</h2> |
2 | -<h2>1. Starting Job</h2> | |
3 | 2 | <p> |
4 | 3 | <img src="help/images/jobs_1.png" align="left" style="margin: 0px 15px 0px 0px;" /> |
4 | +<p><h3>Starting Job</h3> | |
5 | 5 | The situation often arises when your request is too long to be processed interactively. |
6 | 6 | In such a case it is forked into <b><i>a batch mode</i></b>. |
7 | 7 | </p> |
8 | -<p> | |
9 | 8 | "Too long" means 5 sec for Data Mining, Data Downloading |
10 | -and Plotting in PDF/PS formats. In the case of Interactive Plot Session (PNG Plot output) this time increses | |
11 | -to 500 sec. | |
9 | +and Plotting in PDF/PS formats. In the case of Interactive Plot Session (PNG Plot output) this time is increased | |
10 | +up to 500 sec. | |
12 | 11 | </p> |
13 | -<p> You receive warning message, new | |
12 | +<p>If <b><i>a batch mode</i></b> is forked you receive a warning message, new | |
14 | 13 | <b><i>job node</i></b> is added to the corresponding folder in the <b><i>Jobs In Progress</i></b> tree of |
15 | 14 | <b><i>Jobs Tab</i></b> and job information is added into <b><i>Log</i></b> as well. |
16 | 15 | </p> |
17 | 16 | <p> |
18 | 17 | Job name is constructed by adding of the <i>Process ID</i> to the "job" prefix. |
19 | -In case of an error you may always kill your job by opening contex menu (right click on job name) and selecting <b>Stop/Delete Job</b> | |
18 | +In case of an error you may always kill your job by opening context menu (right click on job name) and selecting <b>Stop/Delete Job</b> | |
20 | 19 | item. |
21 | 20 | </p> |
22 | 21 | <p> |
23 | 22 | You may continue with the other tasks in AMDA, or logout. |
24 | 23 | </p> |
24 | +<p> | |
25 | +Usefull information on your job is shown in tooltip while the mouse is over the corresponding job node. | |
26 | +</p> | |
25 | 27 | <br/><br/><br/><br/><br/><br/><br/><br/> |
26 | -<h2>2. Finished Job</h2> | |
27 | 28 | <p> |
28 | -<img src="help/images/jobs_2.png" align="right" style="margin: 15px 0px 15px 0px;" /> | |
29 | - | |
29 | +<img src="help/images/jobs_2.png" align="right" style="margin: 15px 10px 15px 10px;" /> | |
30 | +<hr><h3> Finished Job</h3> | |
30 | 31 | When your job is finished |
31 | -you receive a corresponding info message, <b><i>job node</i></b> is moved to <b><i>Finished Jobs / Results</i></b> folder | |
32 | +you receive info message, | |
33 | +<b><i>job node</i></b> is moved from <b><i>Jobs In Progress</i></b> | |
34 | +into <b><i>Finished Jobs / Results</i></b> folder | |
32 | 35 | and <b><i>Log</i></b> information is updated. |
33 | 36 | </p> |
34 | 37 | <p> |
35 | -To access the result right click the job name and select <b>Show Result</b> item from the context menu. | |
38 | +To access the job result right click the job name and select <b>Show Result</b> item from the context menu. | |
36 | 39 | </p> |
37 | 40 | <p> |
38 | 41 | Think of regular deleting of the old results (<b>Delete Result</b>) - not to explose your WS... |
... | ... |
help/mydataparameter
help/parameterHelp
1 | -<h2><img src="js/resources/images/16x16/edit.png" style="margin: 0px 10px 0px 0px;"/> Constructing a New Parameter</h2> | |
1 | +<h2><img src="js/resources/images/16x16/edit.png" style="margin: 0px 10px 0px 0px;"/> Constructing a New Parameter : <i>Create / Modify Parameter Module</i></h2> | |
2 | +<h3> Constructing parameter </h3> | |
2 | 3 | <p> |
3 | -To construct a new parameter from the existing ones use <b><i>Create/Modify Parameters</i></b> module. | |
4 | +To construct a new parameter from the existing ones use <b><i>Create/Modify Parameter</i></b> module. | |
4 | 5 | <b><i>Drag</i></b> the parameter[s] from the Parameter Tree and <b><i>drop</i></b> |
5 | 6 | it onto the <b><i>Construct Parameter</i></b> area. |
6 | 7 | </p><br/> |
7 | 8 | <img class="centered" src="help/images/derived1.png"> |
8 | 9 | <br/> |
9 | 10 | <p> |
10 | -In the example above the parameters <b><i>bx_gse</i></b> and <b><i>by_gse</i></b> are displayed in the | |
11 | -text area as the unique AMDA parameter identifiers <b><i>imf(0)</i></b> and <b><i>imf(1)</i></b>. | |
11 | +In the example above the parameters <b><i>bx</i></b> and <b><i>bz</i></b> are displayed in the | |
12 | +text area as the unique AMDA parameter identifiers <b><i>imf(0)</i></b> and <b><i>imf_gsm(3)</i></b>. | |
12 | 13 | </p> |
13 | -<p>While constructing you may use different components from the <b><i>Tools For Parameter Construction</i></b> - | |
14 | -for example - <b><i>Constants</i></b>:<br/><br/> | |
14 | +<hr><p>While constructing you may use <b><i>Tools For Parameter Construction</i></b> - | |
15 | +for example - <b><i>Functions</i></b>:<br/><br/> | |
15 | 16 | <img class="centered" src="help/images/derived2.png"><br/> |
16 | -<p> | |
17 | +<hr><p> | |
17 | 18 | To combine different AMDA parameters which possibly have different sampling times |
18 | -you have to specify new parameter sampling (or <b><i>Time Step</i></b>). | |
19 | +you have to specify new parameter sampling (or <b><i>Time Step</i></b>).<br/><p> | |
19 | 20 | Depending on original samplings, AMDA parameters used in the expression will be averaged or interpolated to create |
20 | 21 | new parameter with the requested time resolution. |
21 | 22 | AMDA parameter's sampling times as well as valid globalStart/globalStop intervals |
22 | -are displayed in the tooltip window shown when the mouse is over the parameter name | |
23 | -in Parameters tree. | |
23 | +are shown in the tooltip opened when the mouse is over the corresponding dataset of the WorkSpace Explorer Parameters subtree. | |
24 | 24 | </p> |
25 | -<p>After clicking the <b>Save</b> button new parameter is added to the <b><i>Derived | |
25 | +<hr><p>After clicking the <b>Save</b> button new parameter is added to the <b><i>Derived | |
26 | 26 | Parameters</i></b> tree. |
27 | 27 | From now you can treat it (plot, download, data mining) as if it were real one. |
28 | 28 | </p> |
29 | +<hr><h3>Context menu</h3> | |
29 | 30 | <p> |
30 | -<img align="left" src ="help/images/derived3.png" style="margin: 0px 15px 0px 0px;"/> | |
31 | -You may group your parameters in the folders:</br> | |
31 | +<img align="right" src ="help/images/derived3.png" style="margin: 0px 15px 10px 10px;"/> | |
32 | +You may group your parameters in the folders: | |
32 | 33 | use context menu which is opened on right mouse click |
33 | -on any folder node of the Derived Parameters tree.<br/><br/> | |
34 | +on any folder node of the Derived Parameters subtree.<br/><hr> | |
34 | 35 | To edit, rename, delete derived parameter use context menu opened on right mouse click |
35 | 36 | on the parameter node. |
36 | 37 | </p> |
... | ... |
help/parametersTree
1 | 1 | <h2><img src="js/resources/images/16x16/view_tree.png" style="margin: 0px 10px 0px 0px;"/> Resources Tree: Parameters</h2> |
2 | 2 | <p> |
3 | 3 | <img src="help/images/params.png" align="left" style="margin: 0px 15px 0px 0px;"/> |
4 | -AMDA Parameters differ by their data bases location.<br/> | |
5 | -<ul> | |
6 | -<li><b><i>Local Data</i></b> is stored in the AMDA internal Data Base. | |
7 | -<li><b><i>Remote Data</i></b> is obtained by a call to the Remote Data Centers. | |
8 | -It usually takes time to send the request and to process the response. | |
9 | -<li><b><i>My Data</i></b> is stored in the user WS. It originated from the files uploaded by user. | |
10 | -</ul> | |
4 | +AMDA Parameters differ by their data bases location / origin.<p> | |
5 | +<b><i>AMDA DataBase</i></b> parameters are stored in the AMDA internal Data Base.<p> | |
6 | +<b><i>Remote DataBases</i></b> parameters are obtained by a call to the Remote Data Centers. | |
7 | +It usually takes time to send the request and to process the response.<p> | |
8 | +<b><i>My DataBase</i></b> parameters are stored in the user WS. It originated from the files uploaded by user. | |
9 | + | |
11 | 10 | </p> |
12 | -<br/> | |
11 | +<br/><br/><br/><br/><br/><br/> | |
13 | 12 | <p> |
14 | -<img src="help/images/paramtree.png" align="right" style="margin: 0px 0px 0px 15px;"/> | |
15 | -Parameter tree' hierarchy : </p> | |
16 | -<p> <b><i> | |
17 | - Mission => Instrument => Data Set => Parameter => [Parameter Component] | |
18 | -</i></b> | |
13 | +<img src="help/images/paramtree.png" align="right" style="margin: 10px 10px 10px 15px;"/> | |
14 | +</p> | |
15 | +<hr><p><b>Parameter tree hierarchy :</b> </p> | |
16 | +<p> <i> | |
17 | + [Mission Group] => Mission => Instrument => [Dataset Group] => Data Set => Parameter => [Parameter Component] | |
18 | +</i> | |
19 | 19 | </p> |
20 | +<br/> | |
20 | 21 | <p> |
21 | - Remote Data hierarchy is started with <i>Data Center Name</i> | |
22 | + Remote DataBase hierarchy is started with <i>Data Center Name</i> | |
22 | 23 | </p> |
24 | +<br/> | |
23 | 25 | <p> |
24 | 26 | Parameters and parameter components are shown as circles of different colors |
25 | 27 | with gray for <b>scalars</b> <img src="js/resources/images/12x12/circle_grey.png">, |
26 | 28 | green for <b>vectors</b> <img src="js/resources/images/12x12/circle_green.png"> and |
27 | 29 | orange for <b>spectra</b> <img src="js/resources/images/12x12/circle_orange.png">. |
30 | +<br/> | |
28 | 31 | Cursor over the parameter has a <b><i>cross</i></b> shape <img src="help/images/cursor_plus.png">. |
29 | 32 | To work with the parameter just <b>drag-and-drop</b> it onto the desired module window. |
30 | 33 | Note that the module window should be open in advance. |
31 | 34 | </p> |
35 | +<br/> | |
32 | 36 | <p> |
33 | 37 | Different usefull information is displayed in tooltips when the mouse is over the |
34 | 38 | corresponding tree node. |
... | ... |
... | ... | @@ -0,0 +1,6 @@ |
1 | +<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Plot Objects : Additional Objects</h2> | |
2 | +<img align="left" src="help/images/plotAdds.png" style="margin: 10px 10px 0px 0px;"/> | |
3 | +<img align="left" src="help/images/plotSerieLegendDes.png" style="margin: 10px 10px 0px 0px;"/> | |
4 | +<img align="left" src="help/images/plotSerieLegend.png" style="margin: 10px 10px 0px 0px;"/> | |
5 | +<br/> | |
6 | + | |
0 | 7 | \ No newline at end of file |
... | ... |
... | ... | @@ -0,0 +1,7 @@ |
1 | +<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Plot Objects : Axis</h2> | |
2 | +<img align="left" src="help/images/plotAxis.png" style="margin: 10px 10px 0px 0px;"/> | |
3 | +<img align="left" src="help/images/plotTimeAxe.png" style="margin: 10px 10px 0px 0px;"/> | |
4 | +<img align="left" src="help/images/plotYAxe.png" style="margin: 10px 10px 0px 0px;"/> | |
5 | +<img align="left" src="help/images/plotColorAxe.png" style="margin: 10px 10px 0px 0px;"/> | |
6 | +<br/> | |
7 | + | |
0 | 8 | \ No newline at end of file |
... | ... |
... | ... | @@ -0,0 +1,21 @@ |
1 | +<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Plot Objects : Layout</h2> | |
2 | +Layout defines position of the panels on the page. On click the <b><i>Layout</b></i> element : | |
3 | +<img class="centered" src="help/images/plotLayout.png" style="margin: 10px 10px 10px 10px;"/> | |
4 | +<h3>Implemented Layouts</h3> | |
5 | + | |
6 | + <i>Vertical</i> ( default ): vertical stack of panels;<br/> | |
7 | + all time panels are of the same width;<br/> | |
8 | + one XY panel in the line;<br/> | |
9 | + generic panel height (for Time and XY panel)<br/> | |
10 | + and width (for XY panel) can be defined at this level<br/><br/> | |
11 | + | |
12 | + <i>Auto</i> : automatic layout - if possible combines<br/> | |
13 | + several XY panels at the same level; | |
14 | + only panel height can be defined (XY panel is 'square')<br/><br/> | |
15 | + | |
16 | + <i>Manual</i> : everything is to be defined by user | |
17 | + | |
18 | + <hr> | |
19 | +Two generic panel types : 'Time/Epoch' and 'XY (Scatter/Instant)'; | |
20 | +<br/> | |
21 | + | |
0 | 22 | \ No newline at end of file |
... | ... |
... | ... | @@ -0,0 +1,8 @@ |
1 | +<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Plot Objects : Hierachy</h2> | |
2 | +<img align="right" src="help/images/plotObjects.png" style="margin: 0px 10px 0px 10px;"/> | |
3 | +The plot request form is organised as multi-level plot elements tree. | |
4 | +To modify an element settings just click it and all available options are shown on the right panel. | |
5 | +Current setting is shown next to the corresponding element.<br/><br/> | |
6 | +Note that at any moment you can modify any option for any element. | |
7 | + <br/> | |
8 | + | |
0 | 9 | \ No newline at end of file |
... | ... |
... | ... | @@ -0,0 +1,13 @@ |
1 | +<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Plot Objects : Page</h2> | |
2 | +On click the <b><i>Page</b></i> element : | |
3 | +<img align="left" src="help/images/plotPage.png" style="margin: 10px 10px 20px 0px;"/> | |
4 | +<h3>Non-evident options : Explanation</h3> | |
5 | +<b><i>1. Epoch Superposed Mode</i></b> : if activated - all time intervals | |
6 | +(in a case of time table / catalog input) are plotted on the same page. Note that this setting affects ALL the panels on the page. | |
7 | +<br/><br/>An example of IMF magnitude plot with checked <i>Epoch Superposed Mode</i> and Time Table with 5 intervals as time input : | |
8 | +<br/> <img class="centered" src="help/images/image3.png" style="margin: 0px 10px 10px 0px;"/> | |
9 | +<br/> | |
10 | +<b><i>2. Title</i></b> : Page Title. <i>Font</i> setting in the <b><i>Title</i></b> fieldset affects Page Title only.<br/> | |
11 | +<b><i>3. Font</i></b> : this <i>Font</i> setting affects <i>Copyright</i> only.<br/> | |
12 | +<br/> | |
13 | + | |
0 | 14 | \ No newline at end of file |
... | ... |
help/plotSettings
1 | -<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Global Settings</h2> | |
2 | -<img class="centered" src="help/images/plot_3.png"/> | |
3 | -<br/> | |
1 | +<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Plot Manager : Global Settings</h2> | |
4 | 2 | <p> |
5 | - The form above controls the global plot settings. | |
6 | - <p> | |
7 | - <b><i>File Format</i></b>. You may choose PNG, PDF, PostScript or SVG output format. PNG format produces screen output | |
8 | - and opens an interactive plot session, | |
9 | - while PDF, PostScript and SVG generate files. In the case of TimeTable mode PDF/PS/SVG generate | |
10 | - multi-page files (page per Time Table interval). Note that PostScript output file is always gzipped. | |
11 | - All your PDF/PS/SVG result files are stored in your workspace. They are accesible in two ways | |
3 | + <img src="help/images/plot_png.png" align="right" style="margin: 0px 10px 10px 10px;"/> | |
4 | + <b><i>Output Options</i></b> panel controls the global plot settings.<br/> | |
5 | + <b><i>File Format</i></b>. You may select PNG, PDF, PostScript, or SVG file output format.<br/> | |
6 | + PNG format by default produces screen output and opens an interactive plot session. | |
7 | + | |
8 | + PDF, PostScript and SVG generate files. Of course you may select file output for PNG as well.<br/> | |
9 | + <b><i>File Output</i></b>. If you select file output ( not <i>interactive mode</i> ) you can define | |
10 | + <b><i>File Prefix</i></b>.<br/> | |
11 | + | |
12 | + In the case of TimeTable / Catalog as <b><i>input times</i></b> you have two options : either generate | |
13 | + multi-page files (page per time interval) or generate file per time interval by checking / unchecking | |
14 | + <b><i>One File Per Interval</i></b> checkbox.<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/> | |
15 | + <hr> | |
16 | + All your plot result files are stored in your workspace. They are accessible in two ways | |
12 | 17 | either immediately from <b>Result Window</b> or later on by double-click on the node |
13 | - from the <b>Jobs Tab</b> in the WorkspaceExplorer. | |
14 | - PDF/PS/SVG files are kept in your workspace until you delete them. | |
15 | - </p><br/><br> | |
16 | - <img class="centered" src="help/images/plot_4.png"/> | |
17 | -<br/><br><p> | |
18 | - <b><i>Description</i></b> is shown in the tooltip when your mouse is over the corresponding node in the Jobs Tab. | |
18 | + from the <b>Jobs Tab</b> (Finished Jobs / Results) in the WorkspaceExplorer. | |
19 | + Plot files are kept in your workspace until you delete them. | |
20 | + <p> | |
21 | + Plot brief description is shown in the tooltip when your mouse is over the corresponding node in the Jobs Tab. | |
19 | 22 | The name of the file is constructed by adding some numerical identifier to the prefix <b>result</b> (by default) |
20 | - or to the <b><i>Plot File Name</i></b> if the latter is defined. | |
21 | -</p> | |
22 | - <p> | |
23 | - <b><i>Save Request: </i></b>Plot request may be saved in your Workspace for next use. | |
24 | -Just give the name to a condition (<b><i>Request Name</i></b>) and | |
25 | -click the <b><i>Save Request</i></b> button. Your condition is added to the <b><i>Plot/Download</i></b> | |
26 | -tree of the Workspace Explorer, <b><i>Operations</i></b> tab. | |
23 | + or to the <b><i>File Prefix</i></b> if the latter is defined. | |
27 | 24 | </p> |
25 | + <img class="centered" src="help/images/plot_4.png"/> | |
26 | +<br/><br> | |
27 | +<hr> | |
28 | 28 | <p> |
29 | 29 | <img align="left" src="help/images/plot_request.png" style="margin: 0px 10px 0px 0px;"/><br/> |
30 | + | |
31 | +<b><i>Save Request: </i></b>Plot request can be saved into your Workspace for next use. | |
32 | +Just give the name to it (<b><i>Request Name</i></b>) and | |
33 | +click the <b><i>Save Request</i></b> button. Your request is added to the <b><i>Plot/Download</i></b> | |
34 | +subtree of the Workspace Explorer, <b><i>Operations</i></b> tab. | |
35 | +</p> | |
30 | 36 | Double clicking on plot request name in the <b><i>Plot/Download</i></b> tree |
31 | 37 | (Workspace Explorer, <b><i>Operations</i></b> tab) or selecting <b><i>Plot By Request</i></b> |
32 | -from the context menu opens the Plot Manager module filled with the condition content. | |
38 | +from the context menu opens the Plot Manager module filled with the request content. | |
33 | 39 | </p> |
34 | 40 | <br/> |
35 | 41 | <br/> |
... | ... |
... | ... | @@ -0,0 +1,52 @@ |
1 | +<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Plot Manager : Simplified View</h2> | |
2 | + <p> | |
3 | + <img align="right" src="help/images/simplified.png" style="margin: 0px 10px 10px 10px;"/> | |
4 | + Plot request form is organised as multi-level tree. By default the | |
5 | + main plot elements only (<b><i>Simplified View</i></b>) are shown. Drag-drop any parameter | |
6 | + from Workspace Explorer Parameters tree onto the empty Plot request form. | |
7 | + You'll see <b><i>panel</i></b> and <b><i>parameter</i></b> elements.<br/><br/> | |
8 | + <p> Default plot type for <b><i>panel</i></b> is <b><i>Time Plot</i></b>. | |
9 | + Default drawing type for <b><i>parameter</i></b> is <b><i>Serie</i></b> attached to <b><i>Y left</i></b> axe. | |
10 | + You see these (current) settings next to the plot element.<br/><br/> | |
11 | + To modify an element settings just click it and all available options are shown on the right panel.<br/><br/> | |
12 | + Note that at any moment you can modify any option for any element. <br/> We consider here the main options of | |
13 | + <b><i>panel</i></b> and <b><i>parameter</i></b> elements. For more detals visit <b>Plot In Details</b> section. | |
14 | +<hr> | |
15 | + <h3>1. Panel Element and Its Main Settings</h3> | |
16 | + <img class="left" src="help/images/panelOptions.png"/> | |
17 | + <br/><hr><br/> | |
18 | +<img align="left" src="help/images/panelTypes.png" style="margin: 0px 10px 10px 10px;"/> | |
19 | +<b><i>1.1. Plot type</i></b> defines panel type.<br/> | |
20 | +<i>Time Plot</i> and <i>Scatter Plot</i> types are the mostly used. | |
21 | +Fine plot type selection is being done with parameter <i>Drawing Type</i> option.<br/> | |
22 | +Panel can be defined to be <i>Isotropic</i> (the same 'unit' length in X and Y) for <i>Scatter Plot</i>. | |
23 | +<img align="right" src="help/images/panelScatter.png" style="margin: 10px 10px 10px 10px;"/> <br/><br/> <br/><br/><br/><br/><br/><br/><br/><br/> | |
24 | +<b><i>1.2. Preferred Dimensions</i></b> (panel dimensions) can vary between 0 and 1<br/><br/> | |
25 | +<b><i>1.3. Title</i></b> defines panel title. <i>Font</i> settings in <i>Title</i> fieldset affects panel Title itself only.<br/><br/> | |
26 | +<b><i>1.4. Font</i></b> settings are applied to all panel legends, titles, tickmars etc, except <i>panel Title</i>. | |
27 | +<hr> | |
28 | +<h3>2. Parameter Element and Its Main Settings</h3> | |
29 | +<img align="left" src="help/images/paramElem.png" style="margin: 0px 0px 10px 0px;"/> | |
30 | +<img align="right" src="help/images/paramOptions.png" style="margin: 0px 10px 10px 10px;"/> | |
31 | +<b><i>2.1. Arguments </i></b> depend on parameter type. | |
32 | +For vector parameter, for example, it is vector components.<br/><br/> | |
33 | +<b><i>2.2. Drawing Type</i></b> depends on selected panel <i>Plot type</i>. | |
34 | +Namely with <i>Time Plot</i> panel setting you may select <i>Serie</i>, or <i>Spectro</i>, | |
35 | +or <i>StatusBar</i> <b><i>Drawing Type</i></b>.<br/> | |
36 | +Note that on one <i>Time Plot</i> panel you may plot several parameters | |
37 | +with different drawing types (Serie, TickBar, StatusBar...).<br/><br/> | |
38 | +<b><i>2.3. Y axis</i></b> - left or right.<br/><br/> | |
39 | +<b><i>2.4. Min/Max thresholds</i></b>. Values out of<i> Min/Max thresholds</i> are not shown on the plot. To modify | |
40 | +X/Y range you have to uncheck <i>Simplified View</i> and read <b>Plot In Details / Axis</b> section<br/><br/><br/> | |
41 | + <img align="left" src="help/images/image2.png" style="margin: 0px 0px 10px 0px;"/> | |
42 | +<br/> | |
43 | +<b><i>2.5. Colored Parameter.</i></b> You may colorize plotted parameter with the value of another parameter | |
44 | +by its drag/drop onto this field.<br/> <br/> | |
45 | +<b><i>2.6-2.7. Lines-Symbols.</i></b> Self-explanatory.<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/> | |
46 | +<hr> | |
47 | +<h3>3.0 Parameter Element : Additional "Scatter" Settings</h3> | |
48 | +<img align="left" src="help/images/scatterParam.png" style="margin: 10px 10px 10px 0px;"/> | |
49 | +In case of <b><i>Scatter Plot</i></b> panel type you have to define for <b><i>parameter</i></b> element :<br/><br/> | |
50 | +3.1. Parameter to be used as X values<br/> | |
51 | +3.2. X range ( optional )<br/> | |
52 | +3.3. Reference parameter for resampling ( in case if "X" parameter and "Y" parameter originate from different datasets)<br/> | |
0 | 53 | \ No newline at end of file |
... | ... |
help/plotStart
1 | 1 | |
2 | -<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Getting Started</h2> | |
2 | +<h2><img src="js/resources/images/16x16/plot.png" style="margin: 0px 10px 0px 0px;"/>Plot Manager : Getting Started</h2> | |
3 | 3 | <p> |
4 | -All the Parameters from the WorkspaceExplorer | |
5 | -identified by a circle of any color are "plotable". | |
6 | -Drag the desired parameter[s] and drop onto any place at the Plot form. | |
4 | +All the Parameters from the WorkspaceExplorer Parameters subtree shown as a circle are "plotable". | |
5 | +Drag the desired parameter[s] and drop onto left panel at the <b><i>PlotManager</i></b> form. | |
7 | 6 | Note that parameter names appeared in the Plot form could slightly differ |
8 | -from those of the Workspace Explorer.</p> | |
7 | +from those of the Workspace Explorer tree.</p> | |
9 | 8 | <br/> |
10 | -<img class="centered" src="help/images/plotnew_1.png"/> | |
9 | +<img class="centered" src="help/images/abc_1.png"/> | |
11 | 10 | <br/> |
12 | 11 | <p> |
13 | 12 | Select Time interval you are interested in and click <i>Plot</i> button. |
14 | 13 | Note that you may always find out valid parameter time range as well as sampling time: |
15 | 14 | just consult tooltip displayed when your mouse is over the corresponding dataset node |
16 | 15 | of the WorkspaceExplorer tree.</p> |
17 | -<p> | |
16 | +<hr><p> | |
18 | 17 | Plot form proposes two choices for time selection either by one time interval |
19 | 18 | (<b><i>Interval mode</i></b>) or by a number of intervals (<b><i>TimeTable or Catalog mode</i></b>). |
20 | -In the latter case check 'Time Table' radio button and | |
21 | -drag-drop time table[s] or catalog[s] from the WorkspaceExplorer onto TimeSelector area. | |
19 | +In the latter case click <b><i>Time Table or Catalog</i></b> tab of <b><i>TimeSelection</i></b> panel and | |
20 | +drag-drop time table[s] or catalog[s] from the WorkspaceExplorer onto time selection area. | |
22 | 21 | </p> |
23 | 22 | <br/><br/> |
24 | 23 | <img class="centered" src="help/images/plotnew_2.png"/> |
... | ... |
help/resourceTree
1 | 1 | <h2><img src="js/resources/images/16x16/view_tree.png" style="margin: 0px 10px 0px 0px;"/>WorkSpace Explorer : Resources Tree</h2> |
2 | -<p><b><i>Workspace Explorer</i></b> displays information on the current state of user workspace (WS). | |
3 | -Note that WS size is limited to 200MB.<br/> | |
4 | -The key part of the Workspace Explorer is the <b><i>Resources Tree</i></b>. | |
5 | -It shows the main objects you have access to: </p> | |
2 | +<p><b><i>Workspace Explorer</i></b> displays information on the current state of your workspace (WS). | |
3 | +Note that WS size is limited to 200MB.<br/> WS size increase is possible on request.<p> | |
4 | +</p> | |
6 | 5 | <p> |
7 | 6 | <img src="help/images/resourcesTree.png" align="left" style="margin: 0px 25px 0px 0px;"/> |
7 | +<p>The key part of the Workspace Explorer is the <b><i>Resources Tree</i></b>. | |
8 | +It shows the main objects you have access to: </p> | |
8 | 9 | <li><b><i>Parameters</i></b> - different physical parameters ("base" parameters) which |
9 | -are stored in the local and remote data bases or directly in the user WS and can be treated by AMDA modules. | |
10 | +are stored in the local and remote data bases or directly in your WS and can be treated by AMDA modules.<p> | |
10 | 11 | |
11 | -<li><b><i>Derived Parameters</i></b> - parameters which you may construct from base parameters with the help of mathematical expressions. | |
12 | +<li><b><i>Derived Parameters</i></b> - parameters which you may construct from base parameters with the help of mathematical expressions.<p> | |
12 | 13 | |
13 | -<li><b><i>Aliases</i></b> - short names user may give to base parameters. | |
14 | +<li><b><i>Aliases</i></b> - short names you may give to base parameters.<p> | |
14 | 15 | |
15 | 16 | <li><b><i>Time Tables</i></b> (TT) - files containing time intervals of interest. |
16 | -You may use TTs as input times in AMDA Modules (plot, download,...etc). | |
17 | - | |
18 | -<li><b><i>My Files</i></b> - you may create your own small data base by uploading files into your WS. | |
19 | - </p> | |
20 | -<br/> | |
21 | 17 | \ No newline at end of file |
18 | +You may use TTs as input times in AMDA Modules (plot, download,...etc).<p> | |
19 | + | |
20 | +<li><b><i>Catalogs</i></b> - extended version of Time Tables with additional columns. | |
21 | +You may use Catalogs as input times in AMDA Modules (plot, download,...etc).<p> | |
22 | + | |
23 | +<li><b><i>My Files</i></b> - you may create your own small data base by uploading files. | |
24 | +</p> | |
25 | + | |
22 | 26 | \ No newline at end of file |
... | ... |
help/timetables
1 | 1 | <h2><img src="js/resources/images/16x16/view_tree.png" style="margin: 0px 10px 0px 0px;"/>Resources Tree: Time Tables</h2> |
2 | 2 | <p> |
3 | -There are two different <b><i>Time Tables</i></b> types in AMDA - common and private. | |
4 | -<b><i>My Time Tables</i></b> are accessible by the owner only while <b><i>Shared Time Tables</i></b> are open | |
5 | -to the whole community.</p> | |
3 | +There are two different <b><i>Time Tables</i></b> types in AMDA - common (<i>shared</i>) and private (<i>my</i>). | |
4 | +<b><i>My Time Tables</i></b> are visible to the owner only while <b><i>Shared Time Tables</i></b> are open | |
5 | +to the whole community.</p><br/> | |
6 | 6 | <p> |
7 | -Time Tables can be generated by DataMining module, or you may create | |
7 | +Time Tables can be generated by <b><i>DataMining module</i></b>, or you may create | |
8 | 8 | them manually during Interactive Plot Session, or upload from |
9 | -your local machine or URL. All your time tables are stored in your WS and | |
9 | +your local machine or from URL. All your time tables are stored in your WS and | |
10 | 10 | <b>can be used as input times</b> for AMDA modules. |
11 | -</p> | |
12 | -<p>To access the TimeTable' context menu <b>right click</b> the node in the TimeTable tree. | |
13 | -Note that menu depends on the type of the node clicked (root, folder, leaf..). | |
14 | -<b><i>Edit Time Table</i></b> menu item (or <b>double click</b> the time table name) opens <b><i>Manage Time Tables</i></b> module. | |
11 | +</p><br/> | |
12 | +<p>To access the TimeTable context menu <b>right click</b> the node in the TimeTable subtree. | |
13 | +Note that menu depends on the type of the node clicked (root, folder, leaf..).<br/> | |
14 | +<b><i>Edit TimeTable</i></b> context menu item (or <b>double click</b> the time table name) opens <b><i>Manage TimeTables</i></b> module. | |
15 | 15 | </p><p> |
16 | 16 | <img class="centered" src="help/images/tt_1.png"/> |
17 | 17 | </p> |
... | ... |
... | ... | @@ -0,0 +1,34 @@ |
1 | +<h2><img src="js/resources/images/16x16/mydata.png" style="margin: 0px 10px 0px 0px;"/>Uploading Time Table</h2> | |
2 | +<img align="left" src="help/images/uploadtt_1.png" style="margin: 0px 10px 0px 0px;"/> | |
3 | +<p> | |
4 | +<b>1 :</b> Select time table source - <b><i>Local</i></b> or <b><i>Remote (URL)</i></b>. | |
5 | +</p> | |
6 | +<p> | |
7 | +<b>2 :</b> In the case of <b><i>URL</i></b> you may specify the URL of the site (<b><i>FTP</i></b> | |
8 | +access only for the moment!) and select the file by browsing the remote files. | |
9 | +</p> | |
10 | +<p> | |
11 | +<b>3 :</b> Or put the full file URL (http or ftp) directly into the form. | |
12 | +</p> | |
13 | +<p> | |
14 | +<img align="left" src="help/images/uploadTT_2.png" style="margin: 0px 18px 10px 12px;"/> | |
15 | +<b>4 :</b> Time table format is detected automatically - if not, select the format. | |
16 | +</p> | |
17 | +<p><b><i>VOTable</i></b> format uses ISO time definition. | |
18 | +</p> | |
19 | +<p> | |
20 | +<b><i>ASCII</i></b> format allows different time definitions | |
21 | +</p><p> | |
22 | +Valid time range: <b><i>1970-01-01 - 2038-01-19</i></b>. | |
23 | +</p> | |
24 | +<p> | |
25 | +<b>5 : </b> Don't forget to click the <b><i>Upload</i></b> button. | |
26 | +</p> | |
27 | +<p> | |
28 | +<b>6 : </b>The uploaded time table is shown in the <b><i>TimeTable Manager</i></b> | |
29 | +<img src="js/resources/images/16x16/timeTable.png" style="margin: 0px 10px 0px 0px;"/> window | |
30 | +and user has to <b><i>save</i></b> it in order to store in the WorkSpace. | |
31 | +</p> | |
32 | +<p> | |
33 | +<b>Warning</b> : File size is limited to 30MB | |
34 | +</p> | |
0 | 35 | \ No newline at end of file |
... | ... |
help/visuHelp
install-scripts.sh deleted
js/app/controllers/ExplorerModule.js
js/app/controllers/HelpModule.js
js/app/models/LocalParamNode.js
... | ... | @@ -63,14 +63,14 @@ Ext.define('amdaModel.LocalParamNode', |
63 | 63 | var rank = this.get('rank'); |
64 | 64 | if (rank == 1) this.set('iconCls', 'icon-mercury'); |
65 | 65 | if (rank == 2) this.set('iconCls', 'icon-venus'); |
66 | - if (rank == 5) this.set('iconCls', 'icon-earth'); | |
67 | - if (rank == 6) this.set('iconCls', 'icon-earth'); | |
66 | + if (rank == 5 || rank == 6) this.set('iconCls', 'icon-earth'); | |
68 | 67 | if (rank == 7) this.set('iconCls', 'icon-mars'); |
69 | 68 | if (rank == 8) this.set('iconCls', 'icon-jupiter'); |
70 | 69 | if (rank == 9) this.set('iconCls', 'icon-saturn'); |
70 | + if (rank == 10) this.set('iconCls', 'icon-uranus'); | |
71 | + if (rank == 11) this.set('iconCls', 'icon-neptune'); | |
71 | 72 | if (rank == 93) this.set('iconCls', 'icon-comet'); |
72 | - if (rank == 3) this.set('iconCls', 'icon-sw'); | |
73 | - if (rank == 4) this.set('iconCls', 'icon-sw'); | |
73 | + if (rank == 3 || rank == 4) this.set('iconCls', 'icon-sw'); | |
74 | 74 | if (rank >= 99) this.set('iconCls', 'icon-solarsystem'); |
75 | 75 | } |
76 | 76 | |
... | ... |
js/app/models/MyDataParamNode.js
... | ... | @@ -5,10 +5,7 @@ |
5 | 5 | * @extends amdaModel.InteractiveNode |
6 | 6 | * @brief |
7 | 7 | * @author |
8 | - * @version $Id: MyDataParamNode.js 2683 2014-12-02 10:58:53Z elena $ | |
9 | - ******************************************************************************* | |
10 | - * FT Id : Date : Name - Description | |
11 | - ******************************************************************************* | |
8 | + * @version $Id: MyDataParamNode.js 2683 2014-12-02 10:58:53Z elena | |
12 | 9 | */ |
13 | 10 | |
14 | 11 | Ext.define('amdaModel.MyDataParamNode', { |
... | ... | @@ -34,7 +31,7 @@ Ext.define('amdaModel.MyDataParamNode', { |
34 | 31 | this.set('objectDataModel','amdaModel.FileParamObject'); |
35 | 32 | if (this.get('isParameter')) { |
36 | 33 | if (this.get('size') == 1) |
37 | - this.set('iconCls', 'icon-scalar'); | |
34 | + this.set('iconCls', 'icon-scalar'); | |
38 | 35 | else if(this.get('size') == 3) |
39 | 36 | this.set('iconCls', 'icon-vector'); |
40 | 37 | else |
... | ... | @@ -135,7 +132,7 @@ Ext.define('amdaModel.MyDataParamNode', { |
135 | 132 | module.createWindow(); |
136 | 133 | }); |
137 | 134 | }, |
138 | - | |
135 | + | |
139 | 136 | editLeaf: function() |
140 | 137 | { |
141 | 138 | // load the rootNode and recursively all its child nodes |
... | ... | @@ -285,4 +282,5 @@ Ext.define('amdaModel.MyDataParamNode', { |
285 | 282 | this.updateMask(res.mask); |
286 | 283 | } |
287 | 284 | } |
285 | + | |
288 | 286 | }); |
... | ... |
js/app/views/CatalogUI.js
js/app/views/DownloadUI.js
js/app/views/FiltersUI.js
... | ... | @@ -1110,7 +1110,8 @@ Ext.define('amdaUI.FiltersUI', { |
1110 | 1110 | xtype: 'panel', |
1111 | 1111 | region: 'south', |
1112 | 1112 | title: 'Information', |
1113 | - collapsible: true, | |
1113 | + collapsible: true, | |
1114 | + collapseMode: 'header', | |
1114 | 1115 | height: 103, |
1115 | 1116 | autoHide: false, |
1116 | 1117 | iconCls: 'icon-information', |
... | ... |