Changeset 636 for EVA

Show
Ignore:
Timestamp:
01/22/07 09:30:35 (19 months ago)
Author:
mankoff
Message:

#495: Line Plot Diff; Also #466: Shift X Axes

Location:
EVA/trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • EVA/trunk/Makefile

    r597 r636  
    99RELEASE_DIR=../releases/$(APP)-$(VERSION) 
    1010RELEASE_WDIR=$(RELEASE_DIR)-win 
    11 BASE_DIR=/Users/mankoff/local/Applications/EdGCM/EdGCM\ Helper\ Applications 
     11#BASE_DIR=/Users/mankoff/local/Applications/EdGCM/EdGCM\ Helper\ Applications 
     12BASE_DIR=/Users/mankoff/EdGCM/EVA/releases 
    1213INSTALL_DIR=$(BASE_DIR)/$(APPNAME) 
    13 DEV_DIR=/Users/mankoff/GISS/EVA/trunk 
    1414 
    1515### keep the following list UP TO DATE ### 
    … …  
    2020        @echo "make EVA # build EVA.app" 
    2121        @echo "make idl # build IDL code" 
    22         @echo "make install     # install release to (my) Applications folder" 
     22        @echo "make install     # install release folder" 
     23        @echo "make release-mac # build local release to DMG" 
    2324        @echo "make release     # build & upload VERSIONed release to web" 
    2425        @echo "make release-p # link download file to latest version (public)" 
    … …  
    7374        svn export --force ./sample_data $(RELEASE_DIR)/sample_data 
    7475#       (cd ../releases; zip -r $(ZIP) $(APP)-$(VERSION)) 
     76        (cd ../releases; ln -s $(APP)-$(VERSION) latest) 
    7577        make dmg 
    7678 

  • EVA/trunk/RB_ext/winDataBrowser.xml

    r622 r636  
    11<?xml version="1.0"?> 
    2 <RBProject version="2006r4"> 
     2<RBProject version="2006r2"> 
    33<block type="Window" ID="-1109012280"> 
    44 <ObjName>winDataBrowser</ObjName> 
    … …  
    10071007   <Visible>1</Visible> 
    10081008   <PropertyGroup>ID</PropertyGroup> 
    1009    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10101009  </ViewProperty> 
    10111010  <ViewProperty> 
    … …  
    10131012   <Visible>1</Visible> 
    10141013   <PropertyGroup>ID</PropertyGroup> 
    1015    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10161014  </ViewProperty> 
    10171015  <ViewProperty> 
    … …  
    10191017   <Visible>1</Visible> 
    10201018   <PropertyGroup>ID</PropertyGroup> 
    1021    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10221019  </ViewProperty> 
    10231020  <ViewProperty> 
    … …  
    10261023   <PropertyGroup>Position</PropertyGroup> 
    10271024   <PropertyValue>0</PropertyValue> 
    1028    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10291025   <Enumeration> 
    10301026    <ItemDef>0 - Default</ItemDef> 
    … …  
    10401036   <PropertyGroup>Position</PropertyGroup> 
    10411037   <PropertyValue>300</PropertyValue> 
    1042    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10431038  </ViewProperty> 
    10441039  <ViewProperty> 
    … …  
    10471042   <PropertyGroup>Position</PropertyGroup> 
    10481043   <PropertyValue>300</PropertyValue> 
    1049    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10501044  </ViewProperty> 
    10511045  <ViewProperty> 
    … …  
    10541048   <PropertyGroup>Position</PropertyGroup> 
    10551049   <PropertyValue>64</PropertyValue> 
    1056    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10571050  </ViewProperty> 
    10581051  <ViewProperty> 
    … …  
    10611054   <PropertyGroup>Position</PropertyGroup> 
    10621055   <PropertyValue>64</PropertyValue> 
    1063    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10641056  </ViewProperty> 
    10651057  <ViewProperty> 
    … …  
    10681060   <PropertyGroup>Position</PropertyGroup> 
    10691061   <PropertyValue>32000</PropertyValue> 
    1070    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10711062  </ViewProperty> 
    10721063  <ViewProperty> 
    … …  
    10751066   <PropertyGroup>Position</PropertyGroup> 
    10761067   <PropertyValue>32000</PropertyValue> 
    1077    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10781068  </ViewProperty> 
    10791069  <ViewProperty> 
    … …  
    10821072   <PropertyGroup>Appearance</PropertyGroup> 
    10831073   <PropertyValue>0</PropertyValue> 
    1084    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    10851074   <Enumeration> 
    10861075    <ItemDef>0 - Document</ItemDef> 
    … …  
    11021091   <PropertyGroup>Appearance</PropertyGroup> 
    11031092   <PropertyValue>False</PropertyValue> 
    1104    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11051093  </ViewProperty> 
    11061094  <ViewProperty> 
    … …  
    11091097   <PropertyGroup>Appearance</PropertyGroup> 
    11101098   <PropertyValue>False</PropertyValue> 
    1111    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11121099  </ViewProperty> 
    11131100  <ViewProperty> 
    … …  
    11161103   <PropertyGroup>Appearance</PropertyGroup> 
    11171104   <PropertyValue>&amp;hFFFFFF</PropertyValue> 
    1118    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11191105  </ViewProperty> 
    11201106  <ViewProperty> 
    … …  
    11221108   <Visible>1</Visible> 
    11231109   <PropertyGroup>Appearance</PropertyGroup> 
    1124    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11251110  </ViewProperty> 
    11261111  <ViewProperty> 
    … …  
    11291114   <PropertyGroup>Appearance</PropertyGroup> 
    11301115   <PropertyValue>Untitled</PropertyValue> 
    1131    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11321116  </ViewProperty> 
    11331117  <ViewProperty> 
    … …  
    11361120   <PropertyGroup>Appearance</PropertyGroup> 
    11371121   <PropertyValue>True</PropertyValue> 
    1138    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11391122  </ViewProperty> 
    11401123  <ViewProperty> 
    … …  
    11431126   <PropertyGroup>Appearance</PropertyGroup> 
    11441127   <PropertyValue>False</PropertyValue> 
    1145    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11461128  </ViewProperty> 
    11471129  <ViewProperty> 
    … …  
    11501132   <PropertyGroup>Appearance</PropertyGroup> 
    11511133   <PropertyValue>True</PropertyValue> 
    1152    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11531134  </ViewProperty> 
    11541135  <ViewProperty> 
    … …  
    11571138   <PropertyGroup>Appearance</PropertyGroup> 
    11581139   <PropertyValue>True</PropertyValue> 
    1159    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11601140  </ViewProperty> 
    11611141  <ViewProperty> 
    … …  
    11641144   <PropertyGroup>Appearance</PropertyGroup> 
    11651145   <PropertyValue>False</PropertyValue> 
    1166    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11671146  </ViewProperty> 
    11681147  <ViewProperty> 
    … …  
    11711150   <PropertyGroup>Appearance</PropertyGroup> 
    11721151   <PropertyValue>False</PropertyValue> 
    1173    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11741152  </ViewProperty> 
    11751153  <ViewProperty> 
    … …  
    11781156   <PropertyGroup>Appearance</PropertyGroup> 
    11791157   <PropertyValue>False</PropertyValue> 
    1180    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11811158  </ViewProperty> 
    11821159  <ViewProperty> 
    … …  
    11851162   <PropertyGroup>Appearance</PropertyGroup> 
    11861163   <PropertyValue>True</PropertyValue> 
    1187    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11881164  </ViewProperty> 
    11891165  <ViewProperty> 
    … …  
    11911167   <Visible>1</Visible> 
    11921168   <PropertyGroup>Appearance</PropertyGroup> 
    1193    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    11941169  </ViewProperty> 
    11951170  <ViewProperty> 
    … …  
    11981173   <PropertyGroup>Appearance</PropertyGroup> 
    11991174   <PropertyValue>0</PropertyValue> 
    1200    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    12011175  </ViewProperty> 
    12021176  <ViewProperty> 
    … …  
    12041178   <Visible>1</Visible> 
    12051179   <PropertyGroup>Appearance</PropertyGroup> 
    1206    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    12071180  </ViewProperty> 
    12081181  <ViewProperty> 
    … …  
    12101183   <PropertyGroup>Behavior</PropertyGroup> 
    12111184   <PropertyValue>0</PropertyValue> 
    1212    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    12131185  </ViewProperty> 
    12141186  <ViewProperty> 
    … …  
    12161188   <PropertyGroup>Behavior</PropertyGroup> 
    12171189   <PropertyValue>0</PropertyValue> 
    1218    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    12191190  </ViewProperty> 
    12201191  <ViewProperty> 
    … …  
    12221193   <PropertyGroup>Behavior</PropertyGroup> 
    12231194   <PropertyValue>0</PropertyValue> 
    1224    <InheritsFrom>DragMetalWindow</InheritsFrom> 
    12251195  </ViewProperty> 
    12261196  <ViewProperty> 
    12271197   <ObjName>cursor</ObjName> 
    12281198   <PropertyGroup>Behavior</PropertyGroup> 
    1229    <ItemType>string</ItemType> 
    1230    <EditorType>MultiLineEditor</EditorType> 
    12311199  </ViewProperty> 
    12321200  <ViewProperty> 
    … …  
    12341202   <PropertyGroup>Behavior</PropertyGroup> 
    12351203   <PropertyValue>0</PropertyValue> 
    1236    <ItemType>integer</ItemType> 
    12371204  </ViewProperty> 
    12381205 </ViewBehavior> 
    … …  
    17941761    <SourceLine>end</SourceLine> 
    17951762    <SourceLine></SourceLine> 
     1763    <SourceLine></SourceLine> 
     1764    <SourceLine></SourceLine> 
     1765    <SourceLine></SourceLine> 
     1766    <SourceLine>'dim w1 as winData</SourceLine> 
     1767    <SourceLine>'dim winPlot as winPlot</SourceLine> 
     1768    <SourceLine>'dim c as DatabaseCursor</SourceLine> 
     1769    <SourceLine>dim j, k as integer</SourceLine> 
     1770    <SourceLine>dim a(), s, plotType as string</SourceLine> 
     1771    <SourceLine>dim b(0), fileTypeErr as boolean</SourceLine> 
     1772    <SourceLine>for j = 4 to 6 ' isNetCDF, isTimeSeries, isZonalAverage</SourceLine> 
     1773    <SourceLine>for i = 0 to listoutput.ListCount-1</SourceLine> 
     1774    <SourceLine>if ( listOutput.SelCount = 0 ) OR listOutput.Selected(i) then</SourceLine> 
     1775    <SourceLine>b.append listOutput.CellCheck( i, j ) '</SourceLine> 
     1776    <SourceLine>end</SourceLine> 
     1777    <SourceLine>next</SourceLine> 
     1778    <SourceLine>k = uBound(b)</SourceLine> 
     1779    <SourceLine>for i = 1 to k</SourceLine> 
     1780    <SourceLine>if b(i) &lt;&gt; b(1) then</SourceLine> 
     1781    <SourceLine>fileTypeErr = true</SourceLine> 
     1782    <SourceLine>end</SourceLine> 
     1783    <SourceLine>next</SourceLine> 
     1784    <SourceLine>redim b(0)</SourceLine> 
     1785    <SourceLine>next</SourceLine> 
     1786    <SourceLine>if fileTypeErr then</SourceLine> 
     1787    <SourceLine>msgBox app.lang.Child("DataBrowser").Child("Errors").GetString("ErrorType")</SourceLine> 
     1788    <SourceLine>return</SourceLine> 
     1789    <SourceLine>end</SourceLine> 
     1790    <SourceLine></SourceLine> 
     1791    <SourceLine></SourceLine> 
     1792    <SourceLine></SourceLine> 
     1793    <SourceLine></SourceLine> 
     1794    <SourceLine></SourceLine> 
     1795    <SourceLine></SourceLine> 
    17961796    <SourceLine>dim files(), vars(), times() as string</SourceLine> 
    17971797    <SourceLine>dim c as new DataBaseCursor</SourceLine> 
    … …  
    19001900  <PropertyVal Name="Left">-49</PropertyVal> 
    19011901  <PropertyVal Name="ControlOrder">0</PropertyVal> 
     1902  <PropertyVal Name="Super">CustomContextualMenu</PropertyVal> 
    19021903  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    19031904  <PropertyVal Name="Name">myMenu</PropertyVal> 
    1904   <PropertyVal Name="Super">CustomContextualMenu</PropertyVal> 
    19051905  <ControlIndex>5</ControlIndex> 
    19061906 </Control> 
    … …  
    19371937  <PropertyVal Name="Left">20</PropertyVal> 
    19381938  <PropertyVal Name="ControlOrder">1</PropertyVal> 
     1939  <PropertyVal Name="Super">WindowSplitter</PropertyVal> 
    19391940  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    19401941  <PropertyVal Name="Name">WindowSplitter1</PropertyVal> 
    1941   <PropertyVal Name="Super">WindowSplitter</PropertyVal> 
    19421942  <ControlIndex>6</ControlIndex> 
    19431943 </Control> 
    … …  
    19721972  <PropertyVal Name="Left">566</PropertyVal> 
    19731973  <PropertyVal Name="ControlOrder">2</PropertyVal> 
     1974  <PropertyVal Name="Super">PopupMenu</PropertyVal> 
    19741975  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    19751976  <PropertyVal Name="Name">popupShow</PropertyVal> 
    1976   <PropertyVal Name="Super">PopupMenu</PropertyVal> 
    19771977  <ControlIndex>4</ControlIndex> 
    19781978 </Control> 
    … …  
    20192019  <PropertyVal Name="Left">0</PropertyVal> 
    20202020  <PropertyVal Name="ControlOrder">3</PropertyVal> 
     2021  <PropertyVal Name="Super">DataBrowserListbox</PropertyVal> 
    20212022  <PropertyVal Name="Index">0</PropertyVal> 
    20222023  <PropertyVal Name="Name">myListBox</PropertyVal> 
    2023   <PropertyVal Name="Super">DataBrowserListbox</PropertyVal> 
    20242024  <ControlIndex>2</ControlIndex> 
    20252025 </Control> 
    … …  
    20662066  <PropertyVal Name="Left">182</PropertyVal> 
    20672067  <PropertyVal Name="ControlOrder">4</PropertyVal> 
     2068  <PropertyVal Name="Super">DataBrowserListbox</PropertyVal> 
    20682069  <PropertyVal Name="Index">1</PropertyVal> 
    20692070  <PropertyVal Name="Name">myListBox</PropertyVal> 
    2070   <PropertyVal Name="Super">DataBrowserListbox</PropertyVal> 
    20712071  <ControlIndex>2</ControlIndex> 
    20722072 </Control> 
    … …  
    21132113  <PropertyVal Name="Left">0</PropertyVal> 
    21142114  <PropertyVal Name="ControlOrder">5</PropertyVal> 
     2115  <PropertyVal Name="Super">DataBrowserListbox</PropertyVal> 
    21152116  <PropertyVal Name="Index">3</PropertyVal> 
    21162117  <PropertyVal Name="Name">myListBox</PropertyVal> 
    2117   <PropertyVal Name="Super">DataBrowserListbox</PropertyVal> 
    21182118  <ControlIndex>2</ControlIndex> 
    21192119 </Control> 
    … …  
    21602160  <PropertyVal Name="Left">364</PropertyVal> 
    21612161  <PropertyVal Name="ControlOrder">6</PropertyVal> 
     2162  <PropertyVal Name="Super">DataBrowserListbox</PropertyVal> 
    21622163  <PropertyVal Name="Index">2</PropertyVal> 
    21632164  <PropertyVal Name="Name">myListBox</PropertyVal> 
    2164   <PropertyVal Name="Super">DataBrowserListbox</PropertyVal> 
    21652165  <ControlIndex>2</ControlIndex> 
    21662166 </Control> 
    … …  
    21962196  <PropertyVal Name="Left">13</PropertyVal> 
    21972197  <PropertyVal Name="ControlOrder">7</PropertyVal> 
     2198  <PropertyVal Name="Super">PopupMenu</PropertyVal> 
    21982199  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    21992200  <PropertyVal Name="Name">popupMath</PropertyVal> 
    2200   <PropertyVal Name="Super">PopupMenu</PropertyVal> 
    22012201  <ControlIndex>1</ControlIndex> 
    22022202 </Control> 
    … …  
    22272227  <PropertyVal Name="Left">161</PropertyVal> 
    22282228  <PropertyVal Name="ControlOrder">8</PropertyVal> 
     2229  <PropertyVal Name="Super">PushButton</PropertyVal> 
    22292230  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    22302231  <PropertyVal Name="Name">btnMath</PropertyVal> 
    2231   <PropertyVal Name="Super">PushButton</PropertyVal> 
    22322232  <ControlIndex>3</ControlIndex> 
    22332233 </Control> 
    … …  
    22612261  <PropertyVal Name="Left">296</PropertyVal> 
    22622262  <PropertyVal Name="ControlOrder">9</PropertyVal> 
     2263  <PropertyVal Name="Super">PopupMenu</PropertyVal> 
    22632264  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    22642265  <PropertyVal Name="Name">popupPlot</PropertyVal> 
    2265   <PropertyVal Name="Super">PopupMenu</PropertyVal> 
    22662266  <ControlIndex>0</ControlIndex> 
    22672267 </Control> 
    … …  
    22762276  <PropertyVal Name="Left">-49</PropertyVal> 
    22772277  <PropertyVal Name="ControlOrder">10</PropertyVal> 
     2278  <PropertyVal Name="Super">DatabaseQuery</PropertyVal> 
    22782279  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    22792280  <PropertyVal Name="Name">DatabaseQuery1</PropertyVal> 
    2280   <PropertyVal Name="Super">DatabaseQuery</PropertyVal> 
    22812281  <ControlIndex>7</ControlIndex> 
    22822282 </Control> 
    … …  
    23102310  <PropertyVal Name="Left">330</PropertyVal> 
    23112311  <PropertyVal Name="ControlOrder">11</PropertyVal> 
     2312  <PropertyVal Name="Super">PopupMenu</PropertyVal> 
    23122313  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    23132314  <PropertyVal Name="Name">popMath</PropertyVal> 
    2314   <PropertyVal Name="Super">PopupMenu</PropertyVal> 
    23152315  <ControlIndex>8</ControlIndex> 
    23162316 </Control> 
    … …  
    23522352  <PropertyVal Name="Left">488</PropertyVal> 
    23532353  <PropertyVal Name="ControlOrder">12</PropertyVal> 
     2354  <PropertyVal Name="Super">BevelButtonPush</PropertyVal> 
    23542355  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    23552356  <PropertyVal Name="Name">btnPlot</PropertyVal> 
    2356   <PropertyVal Name="Super">BevelButtonPush</PropertyVal> 
    23572357  <ControlIndex>9</ControlIndex> 
    23582358 </Control> 
    … …  
    23942394  <PropertyVal Name="Left">16</PropertyVal> 
    23952395  <PropertyVal Name="ControlOrder">13</PropertyVal> 
     2396  <PropertyVal Name="Super">BevelButtonPush</PropertyVal> 
    23962397  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    23972398  <PropertyVal Name="Name">BevelButtonPush1</PropertyVal> 
    2398   <PropertyVal Name="Super">BevelButtonPush</PropertyVal> 
    23992399  <ControlIndex>10</ControlIndex> 
    24002400 </Control> 
    … …  
    24362436  <PropertyVal Name="Left">-448</PropertyVal> 
    24372437  <PropertyVal Name="ControlOrder">14</PropertyVal> 
     2438  <PropertyVal Name="Super">BevelButtonPush</PropertyVal> 
    24382439  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    24392440  <PropertyVal Name="Name">BevelButtonPush2</PropertyVal> 
    2440   <PropertyVal Name="Super">BevelButtonPush</PropertyVal> 
    24412441  <ControlIndex>11</ControlIndex> 
    24422442 </Control> 
    … …  
    24782478  <PropertyVal Name="Left">68</PropertyVal> 
    24792479  <PropertyVal Name="ControlOrder">15</PropertyVal> 
     2480  <PropertyVal Name="Super">BevelButtonPush</PropertyVal> 
    24802481  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    24812482  <PropertyVal Name="Name">BevelButtonPush3</PropertyVal> 
    2482   <PropertyVal Name="Super">BevelButtonPush</PropertyVal> 
    24832483  <ControlIndex>12</ControlIndex> 
    24842484 </Control> 
    … …  
    25122512  <PropertyVal Name="Left">13</PropertyVal> 
    25132513  <PropertyVal Name="ControlOrder">16</PropertyVal> 
     2514  <PropertyVal Name="Super">StaticText</PropertyVal> 
    25142515  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    25152516  <PropertyVal Name="Name">StaticText1</PropertyVal> 
    2516   <PropertyVal Name="Super">StaticText</PropertyVal> 
    25172517  <ControlIndex>13</ControlIndex> 
    25182518 </Control> 
    … …  
    25462546  <PropertyVal Name="Left">65</PropertyVal> 
    25472547  <PropertyVal Name="ControlOrder">17</PropertyVal> 
     2548  <PropertyVal Name="Super">StaticText</PropertyVal> 
    25482549  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    25492550  <PropertyVal Name="Name">StaticText2</PropertyVal> 
    2550   <PropertyVal Name="Super">StaticText</PropertyVal> 
    25512551  <ControlIndex>14</ControlIndex> 
    25522552 </Control> 
    … …  
    25802580  <PropertyVal Name="Left">470</PropertyVal> 
    25812581  <PropertyVal Name="ControlOrder">18</PropertyVal> 
     2582  <PropertyVal Name="Super">StaticText</PropertyVal> 
    25822583  <PropertyVal Name="Index">-2147483648</PropertyVal> 
    25832584  <PropertyVal Name="Name">btnPlotText</PropertyVal> 
    2584   <PropertyVal Name="Super">StaticText</PropertyVal> 
    25852585  <ControlIndex>15</ControlIndex> 
    25862586 </Control> 

  • EVA/trunk/RB_ext/winDataPlot.xml

    r635 r636  
    6262   <SourceLine>datagrid.cols = 0</SourceLine> 
    6363   <SourceLine>datagrid.rows = 0</SourceLine> 
    64    <SourceLine>datagrid.cols = xsize+3</SourceLine> 
     64   <SourceLine>datagrid.cols = (xsize*2)+2</SourceLine> 
    6565   <SourceLine>datagrid.rows = ysize+3</SourceLine> 
    6666   <SourceLine></SourceLine> 
    6767   <SourceLine></SourceLine> 
    6868   <SourceLine>// populate the StyleGrid with the data</SourceLine> 
    69    <SourceLine>if not w.diff then</SourceLine> 
     69   <SourceLine>'if not w.diff then</SourceLine> 
    7070   <SourceLine></SourceLine> 
    7171   <SourceLine>dim val as double</SourceLine> 
    7272   <SourceLine>for x = 1 to xsize+1</SourceLine> 
    7373   <SourceLine>for y = 1 to ysize+1</SourceLine> 
    74    <SourceLine>cell = datagrid.WritableCell( x+1, y+1 )</SourceLine> 
     74   <SourceLine></SourceLine> 
     75   <SourceLine>'' data (y)</SourceLine> 
     76   <SourceLine>cell = datagrid.WritableCell( (x*2), y+1 )</SourceLine> 
    7577   <SourceLine>val = w.yy( x-1, y-1 )</SourceLine> 
    7678   <SourceLine>if val &gt;= 0 then cell.style = style else cell.style = styleNeg</SourceLine> 
    7779   <SourceLine>cell.alignment = -1</SourceLine> 
    78    <SourceLine>cell.Text = Format( val, fmt ) + " "</SourceLine> 
     80   <SourceLine>if Val = -1e30 then cell.Text = "Nan" else cell.Text = Format( val, fmt ) + " "</SourceLine> 
     81   <SourceLine></SourceLine> 
     82   <SourceLine>'' axis (x)</SourceLine> 
     83   <SourceLine>cell = datagrid.WritableCell( (x*2)-1, y+1 )</SourceLine> 
     84   <SourceLine>cell.Style = style</SourceLine> 
     85   <SourceLine>cell.Alignment = 1</SourceLine> 
     86   <SourceLine>if w.xx(0,y-1) = -1e30 then cell.Text = "NaN" else cell.text = Str( w.xx( 0, y-1 ) )</SourceLine> 
     87   <SourceLine>cell.Style.BackColor = &amp;cB4B4B4</SourceLine> 
     88   <SourceLine></SourceLine> 
    7989   <SourceLine>next</SourceLine> 
    8090   <SourceLine>next</SourceLine> 
    81    <SourceLine>end</SourceLine> 
     91   <SourceLine>'end</SourceLine> 
    8292   <SourceLine></SourceLine> 
    8393   <SourceLine>// popuplate the top/left/bottom/right cells with the lat/lon/pressure/whatever info</SourceLine> 
    … …  
    8595   <SourceLine>for x = 0 to xsize</SourceLine> 
    8696   <SourceLine>// header</SourceLine> 
    87    <SourceLine>cell = datagrid.WritableCell( x+2, 1 )</SourceLine> 
     97   <SourceLine>cell = datagrid.WritableCell( (x*2)+2, 1 )</SourceLine> 
    8898   <SourceLine>cell.Style = style</SourceLine> 
    8999   <SourceLine>cell.Alignment = 1</SourceLine> 
    90    <SourceLine>cell.Text = xaxis( x )</SourceLine> 
     100   <SourceLine>if Val( xaxis(x) ) = -1e30 then cell.Text = "NaN" else cell.Text = xaxis( x )</SourceLine> 
    91101   <SourceLine>cell.Style.BackColor = &amp;cB4B4B4</SourceLine> 
    92102   <SourceLine>// footer</SourceLine> 
    93    <SourceLine>cell = datagrid.WritableCell( x+2, ysize+3 )</SourceLine> 
     103   <SourceLine>cell = datagrid.WritableCell( (x*2)+2, ysize+3 )</SourceLine> 
    94104   <SourceLine>cell.Style = style</SourceLine> 
    95105   <SourceLine>cell.Alignment = 1</SourceLine> 
    96    <SourceLine>cell.Text = xaxis( x )</SourceLine> 
     106   <SourceLine>if Val( xaxis(x) ) = -1e30 then cell.Text = "NaN" else cell.Text = xaxis( x )</SourceLine> 
    97107   <SourceLine>cell.Style.BackColor = &amp;cB4B4B4</SourceLine> 
    98108   <SourceLine>next</SourceLine> 
    99    <SourceLine>for y = 0 to ysize</SourceLine> 
    100    <SourceLine>// left</SourceLine> 
    101    <SourceLine>cell = datagrid.WritableCell( 1, y+2 )</SourceLine> 
    102    <SourceLine>cell.Style = style</SourceLine> 
    103    <SourceLine>cell.Alignment = 1</SourceLine> 
    104    <SourceLine>'cell.Text = yaxis( y )</SourceLine> 
    105    <SourceLine>cell.text = Str( w.xx( 0, y ) )</SourceLine> 
    106    <SourceLine>cell.Style.BackColor = &amp;cB4B4B4</SourceLine> 
    107    <SourceLine>// right</SourceLine> 
    108    <SourceLine>cell = datagrid.WritableCell( xsize+3, y+2 )</SourceLine> 
    109    <SourceLine>cell.Style = style</SourceLine> 
    110    <SourceLine>cell.Alignment = -1</SourceLine> 
    111    <SourceLine>'cell.Text = yaxis( y )</SourceLine> 
    112    <SourceLine>cell.Text = Str( w.xx( 0, y ) )</SourceLine> 
    113    <SourceLine>cell.Style.BackColor = &amp;cB4B4B4</SourceLine> 
    114    <SourceLine>next</SourceLine> 
     109   <SourceLine>'for y = 0 to ysize</SourceLine> 
     110   <SourceLine>'// left</SourceLine> 
     111   <SourceLine>'cell = datagrid.WritableCell( 1, y+2 )</SourceLine> 
     112   <SourceLine>'cell.Style = style</SourceLine> 
     113   <SourceLine>'cell.Alignment = 1</SourceLine> 
     114   <SourceLine>'if w.xx(0,y) = -1e30 then cell.Text = "NaN" else cell.text = Str( w.xx( 0, y ) )</SourceLine> 
     115   <SourceLine>'cell.Style.BackColor = &amp;cB4B4B4</SourceLine> 
     116   <SourceLine>'// right</SourceLine> 
     117   <SourceLine>'cell = datagrid.WritableCell( xsize+3, y+2 )</SourceLine> 
     118   <SourceLine>'cell.Style = style</SourceLine> 
     119   <SourceLine>'cell.Alignment = -1</SourceLine> 
     120   <SourceLine>'if w.xx(0,y) = -1e30 then cell.Text = "NaN" else cell.Text = Str( w.xx( 0, y ) )</SourceLine> 
     121   <SourceLine>'cell.Style.BackColor = &amp;cB4B4B4</SourceLine> 
     122   <SourceLine>'next</SourceLine> 
    115123   <SourceLine></SourceLine> 
    116124   <SourceLine>// column width &amp; height</SourceLine> 

  • EVA/trunk/RB_ext/winPlot.xml

    r635 r636  
    159159  </ItemSource> 
    160160 </MenuHandler> 
     161 <MenuHandler> 
     162  <ItemName>WindowXshift</ItemName> 
     163  <Compatibility></Compatibility> 
     164  <Visible>1</Visible> 
     165  <ItemSource> 
     166   <TextEncoding>134217984</TextEncoding> 
     167   <SourceLine>Function WindowXshift() As Boolean</SourceLine> 
     168   <SourceLine>dim i, j as integer</SourceLine> 
     169   <SourceLine>dim c as ccurve</SourceLine> 
     170   <SourceLine>dim n as cNode</SourceLine> 
     171   <SourceLine>dim s as string</SourceLine> 
     172   <SourceLine>dim m as double = 9999999999999.999</SourceLine> 
     173   <SourceLine></SourceLine> 
     174   <SourceLine>dim mxv as double</SourceLine> 
     175   <SourceLine></SourceLine>