Revision 11199

View differences:

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/styling/AbstractPlacementConstraints.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.5  2007-04-13 11:59:30  jaume
46
* Revision 1.6  2007-04-13 12:42:45  jaume
47 47
* *** empty log message ***
48 48
*
49
* Revision 1.5  2007/04/13 11:59:30  jaume
50
* *** empty log message ***
51
*
49 52
* Revision 1.4  2007/04/12 16:01:11  jaume
50 53
* *** empty log message ***
51 54
*
......
91 94
	private int placementMode;
92 95
	private boolean bellowTheLine;
93 96
	private boolean aboveTheLine;
97
	private boolean onTheLine;
94 98
	private boolean pageOriented;
95 99
	private int locationAlongLine;
96 100

  
......
174 178
		return aboveTheLine;
175 179
	}
176 180

  
181
	public boolean isOnTheLine() {
182
		return onTheLine;
183
	}
184

  
177 185
	public boolean isPageOriented() {
178 186
		return pageOriented;
179 187
	}
180 188

  
189
	public void setOnTheLine(boolean b) {
190
		this.onTheLine = b;
191
	}
192

  
181 193
	public void setPageOriented(boolean b) {
182 194
		this.pageOriented = b;
183 195
	}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/styling/IPlacementConstraints.java
43 43
 *
44 44
 * $Id$
45 45
 * $Log$
46
 * Revision 1.7  2007-04-13 11:59:30  jaume
46
 * Revision 1.8  2007-04-13 12:42:32  jaume
47 47
 * *** empty log message ***
48 48
 *
49
 * Revision 1.7  2007/04/13 11:59:30  jaume
50
 * *** empty log message ***
51
 *
49 52
 * Revision 1.6  2007/04/12 16:01:11  jaume
50 53
 * *** empty log message ***
51 54
 *
......
118 121
	public abstract void setBellowTheLine(boolean b);
119 122
	public abstract boolean isAboveTheLine();
120 123
	public abstract void setAboveTheLine(boolean b);
124
	public abstract boolean isOnTheLine();
125
	public abstract void setOnTheLine(boolean b);
121 126
	public abstract void setLocationAlongTheLine(int location);
122 127

  
123 128

  
......
152 157
	public abstract boolean isPerpendicular();
153 158

  
154 159
	public abstract boolean isHorizontal();
155

  
156

  
157 160
}
trunk/extensions/extWMS/src/com/iver/cit/gvsig/fmap/layers/FLyrWMS.java
213 213
			if( sFormat == null ) {
214 214
				sFormat = this.getGreatFormat(drv.getFormats());
215 215
			}
216
//			SRS
216
			// SRS
217 217
			Vector allSrs = wmsNode.getAllSrs();
218 218
			boolean isSRSSupported = false;
219 219
			if( sSRS != null ) {
trunk/extensions/extJDBC/src/com/iver/cit/gvsig/fmap/layers/FLayerJDBCVectorial.java
12 12
import com.iver.cit.gvsig.exceptions.layers.XMLLayerException;
13 13
import com.iver.cit.gvsig.fmap.crs.CRSFactory;
14 14
import com.iver.cit.gvsig.fmap.drivers.DefaultDBDriver;
15
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
16 15
import com.iver.cit.gvsig.fmap.drivers.VectorialDatabaseDriver;
17 16
import com.iver.cit.gvsig.fmap.drivers.WithDefaultLegend;
18 17
import com.iver.cit.gvsig.fmap.rendering.LegendFactory;
19 18
import com.iver.cit.gvsig.fmap.rendering.VectorialLegend;
19
import com.iver.cit.gvsig.fmap.rendering.styling.AttrInTableLabeling;
20
import com.iver.cit.gvsig.fmap.rendering.styling.ILabelingStrategy;
20 21
import com.iver.utiles.XMLEntity;
21 22

  
22 23
public class FLayerJDBCVectorial  extends FLyrVect {
......
128 129
            if (this.getRecordset().getDriver() instanceof WithDefaultLegend) {
129 130
                WithDefaultLegend aux = (WithDefaultLegend) this.getRecordset().getDriver();
130 131
                this.setLegend((VectorialLegend) aux.getDefaultLegend());
132

  
133
                ILabelingStrategy labeler = aux.getDefaultLabelingStrategy();
134
                if (labeler instanceof AttrInTableLabeling) {
135
                	((AttrInTableLabeling) labeler).setLayer(this);
136
                }
137

  
138
                this.setLabelingStrategy(labeler);
139

  
131 140
            } else {
132 141
                this.setLegend(LegendFactory.createSingleSymbolLegend(
133 142
                        this.getShapeType()));
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/legend/gui/PlacementProperties.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.5  2007-04-13 12:10:56  jaume
46
* Revision 1.6  2007-04-13 12:43:08  jaume
47 47
* *** empty log message ***
48 48
*
49
* Revision 1.5  2007/04/13 12:10:56  jaume
50
* *** empty log message ***
51
*
49 52
* Revision 1.4  2007/04/12 16:01:32  jaume
50 53
* *** empty log message ***
51 54
*
......
163 166
				LabelingFactory.createPlacementConstraints(constraints.getXMLEntity())	:
164 167
				LabelingFactory.createPlacementConstraints(layer);
165 168
		initialize();
169
		refreshComponents();
166 170
	}
167 171

  
172
	private void refreshComponents() {
173
		getChkOnTheLine().setSelected(constraints.isOnTheLine());
174
		getChkAbove().setSelected(constraints.isAboveTheLine());
175

  
176

  
177
	}
178

  
168 179
	private void initialize() {
169 180
        this.setLayout(new BorderLayout());
170 181
        this.setSize(new Dimension(410,380));
......
557 568
			constraints.setPlacementMode(mode);
558 569
			constraints.setAboveTheLine(getChkAbove().isSelected());
559 570
			constraints.setBellowTheLine(getChkBelow().isSelected());
560
			// what about ON THE LINE??
571
			constraints.setOnTheLine(getChkOnTheLine().isSelected());
561 572

  
562 573
			constraints.setPageOriented(
563 574
					getCmbOrientationSystem().getSelectedIndex() == 1);

Also available in: Unified diff