Revision 47 org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.swing/org.gvsig.lrs.swing.impl/src/main/java/org/gvsig/lrs/swing/impl/JLrsCalibrateRouteParamsController.java

View differences:

JLrsCalibrateRouteParamsController.java
6 6
 */
7 7
package org.gvsig.lrs.swing.impl;
8 8

  
9
import java.awt.Dimension;
9 10
import java.awt.event.ActionEvent;
10 11
import java.awt.event.ActionListener;
11 12
import java.awt.event.ItemEvent;
12 13
import java.awt.event.ItemListener;
13 14
import java.io.File;
14
import java.util.Iterator;
15 15
import java.util.Locale;
16 16

  
17 17
import javax.swing.ComboBoxModel;
......
23 23
import org.apache.commons.io.FileUtils;
24 24
import org.apache.commons.lang3.StringUtils;
25 25
import org.cresques.cts.IProjection;
26
import org.gvsig.fmap.dal.DALLocator;
27
import org.gvsig.fmap.dal.DataManager;
28
import org.gvsig.fmap.dal.DataStoreParameters;
26
import org.slf4j.Logger;
27
import org.slf4j.LoggerFactory;
28

  
29 29
import org.gvsig.fmap.dal.exception.DataException;
30
import org.gvsig.fmap.dal.exception.ReadException;
31
import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
32
import org.gvsig.fmap.dal.feature.EditableFeatureType;
33 30
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
34 31
import org.gvsig.fmap.dal.feature.FeatureStore;
35 32
import org.gvsig.fmap.dal.feature.FeatureType;
36 33
import org.gvsig.fmap.dal.feature.NewFeatureStoreParameters;
37 34
import org.gvsig.fmap.dal.store.shp.SHPNewStoreParameters;
38 35
import org.gvsig.fmap.geom.DataTypes;
39
import org.gvsig.fmap.geom.Geometry;
40
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
41
import org.gvsig.fmap.geom.Geometry.TYPES;
42
import org.gvsig.fmap.geom.GeometryException;
43
import org.gvsig.fmap.geom.GeometryLocator;
44 36
import org.gvsig.fmap.mapcontext.layers.FLayer;
45 37
import org.gvsig.fmap.mapcontext.layers.operations.LayerCollection;
46
import org.gvsig.fmap.mapcontext.layers.operations.LayersVisitor;
47 38
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
48 39
import org.gvsig.lrs.lib.api.DistanceUnits;
49 40
import org.gvsig.lrs.lib.api.LrsAlgorithmParams;
......
55 46
import org.gvsig.lrs.lib.api.exceptions.LrsNeededParameterException;
56 47
import org.gvsig.lrs.swing.api.JLrsAlgorithmParams;
57 48
import org.gvsig.tools.ToolsLocator;
58
import org.gvsig.tools.exception.BaseException;
59 49
import org.gvsig.tools.i18n.I18nManager;
60
import org.gvsig.tools.locator.LocatorException;
61 50
import org.gvsig.tools.swing.api.ActionListenerSupport;
62 51
import org.gvsig.tools.swing.api.ToolsSwingLocator;
63 52
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
64
import org.gvsig.tools.visitor.VisitCanceledException;
65
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;
67 53

  
68 54
public class JLrsCalibrateRouteParamsController extends JLrsCalibrateRouteParamsView  implements JLrsAlgorithmParams{
69 55

  
......
107 93
        lblIdRouteField.setText(i18nManager.getTranslation(lblIdRouteField.getText()));
108 94
        lblCalibratePointLayer.setText(i18nManager.getTranslation(lblCalibratePointLayer.getText()));
109 95
        lblCalibrationPointIdRouteField.setText(i18nManager.getTranslation(lblCalibrationPointIdRouteField.getText()));
110
        lblFromMeasureField.setText(i18nManager.getTranslation(lblFromMeasureField.getText()));
96
        lblMeasureField.setText(i18nManager.getTranslation(lblMeasureField.getText()));
111 97
        lblOutputFile.setText(i18nManager.getTranslation(lblOutputFile.getText()));
112 98
        lblMeasureCalcMethod.setText(i18nManager.getTranslation(lblMeasureCalcMethod.getText()));
113 99
        lblSearchRadius.setText(i18nManager.getTranslation(lblSearchRadius.getText()));
114
        lblMeasureUnits.setText(i18nManager.getTranslation(lblMeasureUnits.getText()));
115 100
        chkInterpolateBetweenCalibrationPoints.setText(i18nManager.getTranslation(chkInterpolateBetweenCalibrationPoints.getText()));
116 101
        chkExtrapolateBeforeCalibrationPoints.setText(i18nManager.getTranslation(chkExtrapolateBeforeCalibrationPoints.getText()));
117 102
        chkExtrapolateAfterCalibrationPoints.setText(i18nManager.getTranslation(chkExtrapolateAfterCalibrationPoints.getText()));
......
149 134
            throw new LrsNeededParameterException("two_or_more_layers_are_needed", null);
150 135
        }
151 136

  
152
        if (!JLrsUtils.validatedCurveAndPointLayer(layers)){
137
        if (!JLrsUtils.validatedMCurveAndPointLayer(layers)){
153 138
            logger.error("Impossible to find the layers needed");
154 139
            throw new LrsNeededParameterException("impossible_to_find_needed_layers",null);
155 140
        }
......
163 148
        validateLayers(layers);
164 149

  
165 150
        // Modelos de los combos
166
        FLayersComboBoxModel inputLayerModel = new FLayersComboBoxModel(this.layers);
151
        FLayersMComboBoxModel inputLayerModel = new FLayersMComboBoxModel(this.layers);
167 152
        FeatureAttributeDescriptorsComboBoxModel idRouteFieldComboBoxModel =
168 153
            new FeatureAttributeDescriptorsComboBoxModel();
169 154

  
......
179 164
        // asignaci?n de renderers y modelos
180 165
        cmbIdRouteField.setRenderer(featureAttributeDescriptorCellRenderer);
181 166
        cmbCalibrationPointIdRouteField.setRenderer(featureAttributeDescriptorCellRenderer);
182
        cmbFromMeasureField.setRenderer(featureAttributeDescriptorCellRenderer);
167
        cmbMeasureField.setRenderer(featureAttributeDescriptorCellRenderer);
183 168
        cmbIdRouteField.setModel(idRouteFieldComboBoxModel);
184 169
        cmbCalibrationPointIdRouteField.setModel(idCalibrationPointFieldComboBoxModel);
185
        cmbFromMeasureField.setModel(fromMeasureFieldComboBoxModel);
170
        cmbMeasureField.setModel(fromMeasureFieldComboBoxModel);
186 171

  
187 172
        // renderer para el combo de capas
188 173
        ListCellRenderer layerNameCellRenderer=new FLayersLayerNameCellRenderer();
......
223 208
            new DefaultComboBoxModel<DistanceUnits>(DistanceUnits.values());
224 209

  
225 210
        cmbMeasureUnits.setModel(measureUnitsModel);
211
        cmbMeasureUnits.setRenderer(new DistanceUnitsCellRenderer());
226 212

  
227 213
        txtSearchRadius.setValue(new Double(0));
228 214

  
......
372 358
        params.setCalibratePointIdRouteField(idRouteFieldCalibratePoint);
373 359

  
374 360
        //cmbFromMeasureField
375
        if (!(this.cmbFromMeasureField.getSelectedItem() instanceof FeatureAttributeDescriptor)){
361
        if (!(this.cmbMeasureField.getSelectedItem() instanceof FeatureAttributeDescriptor)){
376 362
            logger.error("Error getting selected item from cmbFromMeasureField");
377 363
            throw new LrsGettingParametersException("error_getting_selected_item_from_cmbFromMeasureField", null);
378 364
        }
379 365
        FeatureAttributeDescriptor fromMeasureField =
380
            (FeatureAttributeDescriptor) this.cmbFromMeasureField.getSelectedItem();
366
            (FeatureAttributeDescriptor) this.cmbMeasureField.getSelectedItem();
381 367
        if (fromMeasureField == null) {
382 368
            throw new LrsNeededParameterException("need_to_select_a_from_Measure_field", null);
383 369
        }
......
445 431

  
446 432
        this.cmbIdRouteField.setSelectedItem(parameters.getIdRouteField());
447 433
        this.cmbCalibrationPointIdRouteField.setSelectedItem(parameters.getCalibratePointIdRouteField());
448
        this.cmbFromMeasureField.setSelectedItem(parameters.getFromMeasureField());
434
        this.cmbMeasureField.setSelectedItem(parameters.getFromMeasureField());
449 435

  
450 436
        this.txtSearchRadius.setValue(parameters.getSearchRadius());
451 437
        this.chkInterpolateBetweenCalibrationPoints.setSelected(parameters.interpolateBetweenCalibrationPoints());
......
472 458
        }
473 459
        this.cmbIdRouteField.setSelectedIndex(0);
474 460
        this.cmbCalibrationPointIdRouteField.setSelectedIndex(0);
475
//        this.cmbFromMeasureField.setSelectedIndex(0);
461
        this.cmbMeasureField.setSelectedIndex(0);
476 462
        this.cmbMeasureCalcMethod.setSelectedIndex(0);
477 463
        this.cmbMeasureUnits.setSelectedIndex(0);
478 464
        this.chkInterpolateBetweenCalibrationPoints.setSelected(false);
......
523 509
            // Se renuevan los combos de attributeDescriptors
524 510
            FeatureAttributeDescriptorsComboBoxModel calibrationPointIdRouteFieldComboBoxModel =
525 511
                new FeatureAttributeDescriptorsComboBoxModel();
526
            FeatureAttributeDescriptorsComboBoxModel fromMeasureFieldComboBoxModel =
512
            FeatureAttributeDescriptorsComboBoxModel measureFieldComboBoxModel =
527 513
                new FeatureAttributeDescriptorsComboBoxModel();
528 514

  
529 515
            this.cmbCalibrationPointIdRouteField.setModel(calibrationPointIdRouteFieldComboBoxModel);
530
            this.cmbFromMeasureField.setModel(fromMeasureFieldComboBoxModel);
516
            this.cmbMeasureField.setModel(measureFieldComboBoxModel);
531 517

  
532 518
            FeatureAttributeDescriptor[] attributeDescriptors = type.getAttributeDescriptors();
533 519
            for (int i = 0; i < attributeDescriptors.length; i++) {
......
538 524

  
539 525
                    JLrsCalibrateRouteParamsController.this.cmbCalibrationPointIdRouteField.addItem(featureAttributeDescriptor);
540 526
                    if (featureAttributeDescriptor.getDataType().isNumeric()) {
541
                        JLrsCalibrateRouteParamsController.this.cmbFromMeasureField.addItem(featureAttributeDescriptor);
527
                        JLrsCalibrateRouteParamsController.this.cmbMeasureField.addItem(featureAttributeDescriptor);
542 528
                    }
543 529
                }
544 530
            }
545 531
            this.cmbCalibrationPointIdRouteField.invalidate();
546
            this.cmbFromMeasureField.invalidate();
532
            this.cmbMeasureField.invalidate();
547 533

  
548 534
        } catch (DataException e1) {
549 535
            logger.warn(
......
552 538
        }
553 539
    }
554 540

  
541
    /* (non-Javadoc)
542
     * @see javax.swing.JComponent#getPreferredSize()
543
     */
544
    @Override
545
    public Dimension getPreferredSize() {
546
        return new Dimension(650, 350);
547
    }
555 548

  
556 549

  
557 550

  

Also available in: Unified diff