Revision 8300

View differences:

trunk/libraries/libArcIMS/src/org/gvsig/remoteClient/arcims/styling/renderers/ArcImsFLegendFactory.java
87 87

  
88 88
import com.hardcode.gdbms.engine.values.Value;
89 89

  
90
import com.iver.cit.gvsig.fmap.core.ISymbol;
90 91
import com.iver.cit.gvsig.fmap.core.v02.FConstant;
91 92
import com.iver.cit.gvsig.fmap.core.v02.FSymbol;
92 93
import com.iver.cit.gvsig.fmap.rendering.ClassifiedLegend;
......
499 500
        if (auxLabelsOuter!=null && legends.size()>0){
500 501
        	
501 502
        	for (int i=0;i<legends.size();i++){
502
        		FSymbol simb1 = auxLabelsOuter.getDefaultSymbol();
503
            	FSymbol simb2 = ((VectorialLegend) legends.get(i)).getDefaultSymbol();
503
//        		FSymbol simb1 = auxLabelsOuter.getDefaultSymbol();
504
//            	FSymbol simb2 = ((VectorialLegend) legends.get(i)).getDefaultSymbol();
505
        		FSymbol simb1 = (FSymbol) auxLabelsOuter.getDefaultSymbol();
506
            	FSymbol simb2 = (FSymbol)  ((VectorialLegend) legends.get(i)).getDefaultSymbol();
504 507
            	
505 508
            	if (simb1==simb2){
506 509
            		//Null the biggerScale to force the next if statement
......
541 544
         */
542 545
        if (auxLabelsInner != null) {
543 546
        	finalLegend = setLabelDefIntoSymbol(auxLabelsInner,finalLegend);
544
        	finalLegend.getDefaultSymbol().setShapeVisible(!onlyLabels);
547
        	
548
        	// finalLegend.getDefaultSymbol().setShapeVisible(!onlyLabels);
549
        	((FSymbol) finalLegend.getDefaultSymbol()).setShapeVisible(!onlyLabels);
550
        	
545 551
        	auxLabelsOuter = finalLegend;
546 552
        }
547 553
        return finalLegend;
......
623 629
		//Set the label
624 630
	    finalLegend.setLabelField(withLabels.getLabelField());
625 631
	    //Get simbol with font definition
626
	    FSymbol simbWithFont = withLabels.getDefaultSymbol();
632
	    
633
	    // FSymbol simbWithFont = withLabels.getDefaultSymbol();
634
	    FSymbol simbWithFont = (FSymbol) withLabels.getDefaultSymbol();
635
	    
627 636
	    //Get simbol to insert font definition
628
	    FSymbol simb = finalLegend.getDefaultSymbol();
637
	    // FSymbol simb = finalLegend.getDefaultSymbol();
638
	    FSymbol simb = (FSymbol) finalLegend.getDefaultSymbol();
639
	    
629 640
	    //Insert into simb the font properties
630 641
	    simb.setFont(simbWithFont.getFont());
631 642
	    simb.setFontColor(simbWithFont.getFontColor());
trunk/extensions/extArcims/Cliente-ArcIMS.number
1 1
#Build Number for ANT. Do not edit!
2
#Tue Oct 03 12:35:11 CEST 2006
2
#Tue Oct 24 16:20:21 CEST 2006
3 3
build.number=68
trunk/extensions/extArcims/src/es/prodevelop/cit/gvsig/arcims/extension/ArcimsClientModule.java
8 8
import com.iver.andami.plugins.Extension;
9 9
import com.iver.cit.gvsig.About;
10 10
import com.iver.cit.gvsig.AddLayer;
11
import com.iver.cit.gvsig.gui.toc.FPopupMenu;
11
import com.iver.cit.gvsig.project.documents.view.toc.gui.FPopupMenu;
12 12
import com.iver.utiles.extensionPoints.ExtensionPoints;
13 13
import com.iver.utiles.extensionPoints.ExtensionPointsSingleton;
14 14

  
trunk/extensions/extArcims/src/es/prodevelop/cit/gvsig/arcims/fmap/drivers/FMapFeatureArcImsDriver.java
53 53
import com.iver.cit.gvsig.fmap.layers.FLayer;
54 54
import com.iver.cit.gvsig.fmap.layers.LayerFactory;
55 55
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
56
import com.iver.cit.gvsig.gui.Table;
57 56
import com.iver.cit.gvsig.project.Project;
58
import com.iver.cit.gvsig.project.ProjectTable;
59
import com.iver.cit.gvsig.project.ProjectView;
57
import com.iver.cit.gvsig.project.ProjectFactory;
58
import com.iver.cit.gvsig.project.documents.table.ProjectTable;
59
import com.iver.cit.gvsig.project.documents.view.ProjectView;
60
import com.iver.cit.gvsig.project.documents.view.gui.View;
60 61

  
61 62
import es.prodevelop.cit.gvsig.arcims.fmap.drivers.ArcImsAttributesDataSourceAdapter;
62 63
import es.prodevelop.cit.gvsig.arcims.fmap.layers.FFeatureLyrArcIMS;
......
235 236
			IWindow v = PluginServices.getMDIManager().getActiveWindow();
236 237
			
237 238
			if (v == null) {
238
				ProjectView newprojview = ProjectView.createView("Nueva");
239
				com.iver.cit.gvsig.gui.View newview = new com.iver.cit.gvsig.gui.View();
240
				newview.setModel(newprojview);
239
				
240
				ProjectView pv = new ProjectView();
241
				pv.setName("Nueva");
242
				View newview = (View) pv.createWindow();
243
				newview.setModel(pv);
241 244
				Project newproj = new Project();
242 245
				newproj.setName("nuevo");
243
				newproj.addView(newprojview);
246
				newproj.addDocument(pv);
247
				// newproj.addView(newprojview);
244 248
				v = newview;
245 249
			}
246 250

  
247
			ProjectView pv = ((com.iver.cit.gvsig.gui.View) v).getModel();
248
			ProjectTable pt = ProjectTable.createTable(attsDataSourceAdapter.getName(), eadapter);
249
			pv.getProject().addTable(pt);
251
			ProjectView pv = (ProjectView) ((View) v).getModel();
252
			ProjectTable pt = ProjectFactory.createTable(attsDataSourceAdapter.getName(), eadapter);
253
			pv.getProject().addDocument(pt);
250 254
		} catch (Exception e) {
251 255
			logger.error("While creating DataSource ", e);
252 256
			e.printStackTrace();
trunk/extensions/extArcims/src/es/prodevelop/cit/gvsig/arcims/fmap/layers/FFeatureLyrArcIMS.java
39 39
import com.iver.cit.gvsig.fmap.ViewPort;
40 40
import com.iver.cit.gvsig.fmap.core.DefaultFeature;
41 41
import com.iver.cit.gvsig.fmap.core.IGeometry;
42
import com.iver.cit.gvsig.fmap.core.ISymbol;
42 43
import com.iver.cit.gvsig.fmap.core.v02.FSymbol;
43 44
import com.iver.cit.gvsig.fmap.crs.CRSFactory;
44 45
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
......
207 208
				geom = (IGeometry) geometries.get(i);
208 209
				if (geom.intersects(bBox)) {
209 210
					clonedGeom = geom.cloneGeometry();
210
					FSymbol symbol = ((VectorialLegend) getLegend()).getSymbol(i);
211
					ISymbol symbol = (ISymbol) ((VectorialLegend) getLegend()).getSymbol(i);
212
					// FSymbol symbol = ((VectorialLegend) getLegend()).getSymbol(i);
211 213
					if (layerTransf != null) geom.reProject(layerTransf);
212 214
					clonedGeom.draw(g, viewPort, symbol);
213 215
				}
......
256 258
				} else {
257 259
					clonedGeom = geom.cloneGeometry();
258 260
					int ov_index = drv.getOverallIndex(i);
259
					FSymbol symbol = getSymbolOrSelected(ov_index, ((VectorialLegend) getLegend()).getSymbol(ov_index));
261
					ISymbol symbol = (ISymbol) getSymbolOrSelected(ov_index,
262
							(FSymbol) ((VectorialLegend) getLegend()).getSymbol(ov_index));
263
					// FSymbol symbol = getSymbolOrSelected(ov_index, ((VectorialLegend) getLegend()).getSymbol(ov_index));
260 264
					if (layerTransf != null)
261 265
						geom.reProject(layerTransf);
262 266
					clonedGeom.draw(g, viewPort, symbol);
trunk/extensions/extArcims/src/es/prodevelop/cit/gvsig/arcims/gui/dialogs/LayerScaleDialog.java
22 22
import com.iver.andami.PluginServices;
23 23
import com.iver.andami.ui.mdiManager.IWindow;
24 24
import com.iver.andami.ui.mdiManager.WindowInfo;
25
import com.iver.cit.gvsig.gui.View;
25
import com.iver.cit.gvsig.project.documents.view.gui.View;
26 26

  
27 27
/**
28 28
 * This class shows the ArcIMS layer's scale limits status.
trunk/extensions/extArcims/src/es/prodevelop/cit/gvsig/arcims/gui/panels/FeatureServicePanel.java
29 29
import java.util.Vector;
30 30

  
31 31
import com.iver.andami.PluginServices;
32
import com.iver.cit.gvsig.gui.FOpenDialog;
32
import com.iver.cit.gvsig.project.documents.gui.FOpenDialog;
33 33
import com.iver.utiles.swing.JComboBox;
34 34

  
35 35
import javax.swing.JScrollPane;
trunk/extensions/extArcims/src/es/prodevelop/cit/gvsig/arcims/gui/wizards/ArcImsWizard.java
12 12

  
13 13
import com.iver.andami.PluginServices;
14 14
import com.iver.cit.gvsig.fmap.layers.FLayer;
15
import com.iver.cit.gvsig.gui.View;
15
import com.iver.cit.gvsig.project.documents.view.gui.View;
16 16
import com.iver.cit.gvsig.gui.WizardPanel;
17 17
import com.iver.cit.gvsig.gui.wizards.WizardListener;
18 18
import com.iver.cit.gvsig.gui.wizards.WizardListenerSupport;
trunk/extensions/extArcims/src/es/prodevelop/cit/gvsig/arcims/gui/toc/ArcImsPropsTocMenuEntry.java
5 5

  
6 6
import com.iver.andami.PluginServices;
7 7
import com.iver.cit.gvsig.fmap.layers.FLayer;
8
import com.iver.cit.gvsig.gui.toc.FPopupMenu;
9
import com.iver.cit.gvsig.gui.toc.TocMenuEntry;
8
import com.iver.cit.gvsig.project.documents.view.toc.TocMenuEntry;
9
import com.iver.cit.gvsig.project.documents.view.toc.gui.FPopupMenu;
10 10

  
11 11
import es.prodevelop.cit.gvsig.arcims.fmap.layers.FFeatureLyrArcIMS;
12 12
import es.prodevelop.cit.gvsig.arcims.fmap.layers.FRasterLyrArcIMS;
trunk/extensions/extArcims/src/es/prodevelop/cit/gvsig/arcims/gui/toc/ArcImsLayerScaleTocMenuEntry.java
7 7
import com.iver.andami.PluginServices;
8 8
import com.iver.andami.ui.mdiManager.IWindow;
9 9
import com.iver.cit.gvsig.fmap.layers.FLayer;
10
import com.iver.cit.gvsig.gui.View;
11
import com.iver.cit.gvsig.gui.toc.FPopupMenu;
12
import com.iver.cit.gvsig.gui.toc.TocMenuEntry;
10
import com.iver.cit.gvsig.project.documents.view.gui.View;
11
import com.iver.cit.gvsig.project.documents.view.toc.TocMenuEntry;
12
import com.iver.cit.gvsig.project.documents.view.toc.gui.FPopupMenu;
13 13

  
14 14
import es.prodevelop.cit.gvsig.arcims.fmap.layers.FRasterLyrArcIMS;
15 15
import es.prodevelop.cit.gvsig.arcims.gui.dialogs.LayerScaleDialog;
trunk/extensions/extArcims/src/es/prodevelop/cit/gvsig/arcims/gui/toc/ArcImsRasterPropsTocMenuEntry.java
22 22
import com.iver.andami.PluginServices;
23 23
import com.iver.cit.gvsig.fmap.layers.FLayer;
24 24
import com.iver.cit.gvsig.fmap.layers.FLyrRaster;
25
import com.iver.cit.gvsig.project.documents.view.toc.TocMenuEntry;
26
import com.iver.cit.gvsig.project.documents.view.toc.gui.FPopupMenu;
25 27

  
26 28
import es.prodevelop.cit.gvsig.arcims.fmap.layers.FRasterLyrArcIMS;
27 29
import es.prodevelop.cit.gvsig.arcims.gui.dialogs.ArcImsRasterPropsDialog;
28 30

  
29
import com.iver.cit.gvsig.gui.toc.FPopupMenu;
30
import com.iver.cit.gvsig.gui.toc.TocMenuEntry;
31

  
32 31
/**
33 32
 * This class implements the raster properties menu item that is
34 33
 * added to the ArcIMS layer's popup menu.
trunk/extensions/extArcims/about/Thumbs.db
1
????>??	????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Root Entry??????????????1????????Catalog????????????4????????????	
2

3
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????JFIF``??C
4

5

6

7

8
??C		
9

10
??B`"??	
11
???}!1AQa"q2???#B??R??$3br?	
12
%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz???????????????????????????????????????????????????????????????????????????	
13
???w!1AQaq"2?B????	#3R?br?
14
$4?%?&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz????????????????????????????????????????????????????????????????????????????S?$
15
	?&?_?=?P?S%?aB?B??Mq??kh????\??8?)??v?W?i?./?mD%???I=:}z?WUs??k
16
E,?l;`n#?qh.o?L?d?AV<?i?#
17
(??
18
(??!???5/J???O`MLzP?|U?c?????9"???q??|???g$?_?~%????&.Q?I?}?;???vz??cp?|??Z?J?2z??j????????#N?u
19
CS???:?#?????	?3????q???N???????????m6?W~H????EfM??_???}%???D????&?S?Y?6??n!Y!?Ic*?????????~???mB????L{?9n`?<?)d?8?????g???????K?GO????uo???b?|?!??????Rz?rX????????l?k&?????u?nb???I&?????H?????v?7&??|????i}??Q%??dM ?}???)g?F??v??X?Kd}*&?T???l??w??|D???yb???"?o????
20
??K??4?c?6??dPA(@?Y????e????????Z??f.n?V?L?f??#-?(??b?g5?_|?????,??[b?;y4?????<Nr???5Z??F?I???h??S.i?1N????A?g?????Q?s?9?c???*?<??x6?W?{?a???Id??.b???]?+'?W'?}e^m?|6?|7;?O?i??XUm??B??p???Av??????t??s??????+p7?g?????5i?kvnK???{*?Cux?>??S?Kn???,??????jJ??V/?nnu@?\?K;gW????)??O???p?4?5?7?ew?;>???<1?'?f$e?^???+h?K?7-??<?pVd?@ o?1??[?????@?(??=?2[??W1g???"????|???1???u-.[?1t?U???F??N??C??c?ZQ??d?u??#?5??CE?"??1?G'?)7v4?QEH?(????i?????Z?##?Ep?
21
??JT0??L	h?i?;Q3/?>?@X#C??}<:
22
h?O??J=:?(??(??(??(??(??-PEPEPEP??``$z?H??logo.png
0 23

  
trunk/extensions/extArcims/about/extarcims-about.html
16 16
			<li>Jorge Gaspar Sanz Salinas,</li>
17 17
			<li>Juan Lucas Dom&iacute;nguez Rubio</li>
18 18
		</ul>
19
		<p>Build Number de la extensi&oacute;n: 67</p>
19
		<p>Build Number de la extensi&oacute;n: 68</p>
20 20
		<center>
21 21
			<p><b><a href="http://www.prodevelop.es" title="Prodevelop">http://www.prodevelop.es</a></b></p>
22 22
		</center>
trunk/extensions/extArcims/images/.cvsignore
1
Thumbs.db
trunk/extensions/extArcims/images/Thumbs.db
1
????>??	????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????	
2

3
????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Root Entry???????? ?????@1????????????RCatalog?????????????2????*	
4

5
????9???? !"#$%&'()????+,-./012345678????:;????=>?@ABCDEFGH????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????F????JFIF``??C
6

7

8

9

10
??C		
11

12
??"??	
13
???}!1AQa"q2???#B??R??$3br?	
14
%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz???????????????????????????????????????????????????????????????????????????	
15
???w!1AQaq"2?B????	#3R?br?
16
$4?%?&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz?????????????????????????????????????????????????????????????????????????????????????~?=???6W??ur\?G???e?i?0?-u]*?.?:I??H?A?# ?_;?D????a?o?Z???'??Csp??x??mFo??BC??
17
?B?[?????(??<??W??/???????Q??o. ?*?pPd?????0?H??@?4?h?N?i??j?\0D8Q??y$?I'$?I$?E?EP??``*?bI0L?forward.png,????JFIF``??C
18

19

20

21

22
??C		
23

24
??"??	
25
???}!1AQa"q2???#B??R??$3br?	
26
%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz???????????????????????????????????????????????????????????????????????????	
27
???w!1AQaq"2?B????	#3R?br?
28
$4?%?&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz????????????????????????????????????????????????????????????????????????????S?$???Ch????_?w???Ck$Jr!??k1?????1N??T>&??N?????yy?`?U2?b2??+????x??j?	?M?l??}??W?$?6???p6?n0?Y???+?? |?|q??x??u?????-?????F(~x????(?P??(??t????JFIF``??C
29

30

31

32

33
??C		
34

35
??"??	
36
???}!1A3?????????????4????*?5????????<0????????????Qa"q2???#B??R??$3br?	
37
%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz???????????????????????????????????????????????????????????????????????????	
38
???w!1AQaq"2?B????	#3R?br?
39
$4?%?&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz??????????????????????????????????????????????????????????????????????????????}O?~??????C5???????????s???c&??/?F?w?O
40
?.?????BY"S?l?Y???`?yo?5????~'???	?5o?}??????.A%wr????#|'?^?????$?y???M?}?@??h?n6?c???(?;?W?/?I?2?'???f??j?????>|M|??f????8?T? |?|q??x??u?????-?????F(~x????(?P??(???????JFIF``??C
41

42

43

44

45
??C		
46

47
??"??	
48
???}!1AQa"q2???#B??R??$3br?	
49
%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz???????????????????????????????????????????????????????????????????????????	
50
???w!1AQaq"2?B????	#3R?br?
51
$4?%?&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz?????????????????????????????????????????????????????????????????????????????????????~?=???6W??ur\?G???O?O???_u?^{RKt?{qt???<Q??I?d$a?x<???D????a?o?Z???V??????x	>????J?'?+????????]&??SJ????}??fs?r????EU????7?yC??
52
(????~??g?l4-F???`?a???;J? );??9R+?_?v??-W??c???o?????c??2?1$#???$?MP??O????i-???U@8??(????bI0L?backward.png4?bI0L?fastbackward.png2?bI0L?fastforward.png2uY???arrowbutton.png$????JFIF``??C
53

54

55

56

57
??C		
58

59
??"??	
60
???}!1AQa"q2???#B??R??$3br?	
61
%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz???????????????????????????????????????????????????????????????????????????	
62
???w!1AQaq"2?B????	#3R?br?
63
$4?%?&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz????????????????????????????????????????????????????????????????????????????????/?9,???#?
64
+?F?>?m
65
1????Pp\g???G???~1?<!?_????jz5?34|???,????85??l??+H???uM2[s*H??f??"U???E;?#????A??sxKB??<E??
66
??p?[i?;k;?s????Ibyb?$?I$?k?^???(?????
0 67

  

Also available in: Unified diff