Revision 17 org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.swing/org.gvsig.lrs.swing.impl/src/main/java/org/gvsig/lrs/swing/impl/EditRouteCalibrationTableModel.java

View differences:

EditRouteCalibrationTableModel.java
67 67
    private void fillData() throws BaseException {
68 68
        final MutableInt rowNumber=new MutableInt(0);
69 69
      //TODO Changed to test meanwhile class is developed
70
        final MutableDouble testMValue=new MutableDouble(0);
70
//        final MutableDouble testMValue=new MutableDouble(0);
71 71
        maxValue=null;
72 72
        minValue=null;
73 73

  
74 74
        if (editedFeature.get(fadIdRoute.getName()) instanceof String ){
75 75
            Geometry geometry=editedFeature.getDefaultGeometry();
76 76
            //TODO Must be changed to LINE. Changed to test meanwhile class is developed
77
            if (geometry.getGeometryType().isTypeOf(Geometry.TYPES.CURVE)){
77
            if (geometry.getGeometryType().isTypeOf(Geometry.TYPES.LINE)){
78 78
                Line line=(Line) geometry;
79 79
                for (int i=0;i<line.getNumVertices();i++){
80 80
                    data[rowNumber.getValue()][0]=editedFeature.get(fadIdRoute.getName()); //IDROUTE
......
84 84
                    data[rowNumber.getValue()][3]=vertex.getY(); //YCOORDINATE
85 85

  
86 86
                    //TODO Changed to test meanwhile class is developed
87
                    //Double mValue=vertex.getCoordinateAt(CoordinateSequence.M); //MCOORDINATE
88
                    Double mValue=testMValue.getValue();
87
                    Double mValue=vertex.getCoordinateAt(vertex.getDimension()-1); //MCOORDINATE
88
//                    Double mValue=testMValue.getValue();
89 89
                    data[rowNumber.getValue()][COLUMN_MCOORDINATE]=mValue;
90 90
                    if (maxValue==null||maxValue.compareTo(mValue)<0){
91 91
                        maxValue=mValue;
......
94 94
                        minValue=mValue;
95 95
                    }
96 96
                    //double random = new Random().nextDouble();
97
                    double random=new Double(1);
98
                    testMValue.setValue(testMValue.getValue() + random);
97
//                    double random=new Double(1);
98
//                    testMValue.setValue(testMValue.getValue() + random);
99 99

  
100 100
                    rowNumber.setValue(rowNumber.getValue()+1);
101 101
                }
102 102
            }
103 103
            //TODO Must be changed to MULTILINE. Changed to test meanwhile class is developed
104
            if (geometry.getGeometryType().isTypeOf(Geometry.TYPES.MULTICURVE)){
104
            if (geometry.getGeometryType().isTypeOf(Geometry.TYPES.MULTILINE)){
105 105
                MultiLine multiline=(MultiLine) geometry;
106 106
                for (int i=0;i<multiline.getPrimitivesNumber();i++){
107 107
                    Line line=(Line)multiline.getPrimitiveAt(i);
......
113 113
                        data[rowNumber.getValue()][3]=vertex.getY(); //YCOORDINATE
114 114

  
115 115
                        //TODO Changed to test meanwhile class is developed
116
                        //Double mValue=vertex.getCoordinateAt(CoordinateSequence.M); //MCOORDINATE
117
                        Double mValue=testMValue.getValue();
116
                        Double mValue=vertex.getCoordinateAt(vertex.getDimension()-1); //MCOORDINATE
117
                        //Double mValue=testMValue.getValue();
118 118
                        data[rowNumber.getValue()][COLUMN_MCOORDINATE]=mValue;
119 119
                        if (maxValue==null||maxValue.compareTo(mValue)<0){
120 120
                            maxValue=mValue;
......
123 123
                            minValue=mValue;
124 124
                        }
125 125
                        //double random = new Random().nextDouble();
126
                        double random=new Double(1);
127
                        testMValue.setValue(testMValue.getValue() + random);
126
                        //double random=new Double(1);
127
                        //testMValue.setValue(testMValue.getValue() + random);
128 128

  
129 129
                        rowNumber.setValue(rowNumber.getValue()+1);
130 130
                    }
......
142 142
        if (editedFeature.get(fadIdRoute.getName()) instanceof String ){
143 143
            Geometry geometry=editedFeature.getDefaultGeometry();
144 144
            //TODO Must be changed to LINE. Changed to test meanwhile class is developed
145
            if (geometry.getGeometryType().isTypeOf(Geometry.TYPES.CURVE)){
145
            if (geometry.getGeometryType().isTypeOf(Geometry.TYPES.LINE)){
146 146
                Line line=(Line) geometry;
147 147
                for (int i=0;i<line.getNumVertices();i++){
148 148
                    rowNumber.setValue(rowNumber.getValue()+1);
149 149
                }
150 150
            }
151 151
            //TODO Must be changed to MULTILINE. Changed to test meanwhile class is developed
152
            if (geometry.getGeometryType().isTypeOf(Geometry.TYPES.MULTICURVE)){
152
            if (geometry.getGeometryType().isTypeOf(Geometry.TYPES.MULTILINE)){
153 153
                MultiLine multiline=(MultiLine) geometry;
154 154
                for (int i=0;i<multiline.getPrimitivesNumber();i++){
155 155
                    Line line=(Line)multiline.getPrimitiveAt(i);

Also available in: Unified diff