Revision 5395

View differences:

trunk/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/tools/PolylineCADTool.java
423 423
     * @param s Diferent option.
424 424
     */
425 425
    public void addOption(String s) {
426
        PolylineCADToolState actualState = (PolylineCADToolState) _fsm.getPreviousState();
426
    	/*       PolylineCADToolState actualState = (PolylineCADToolState) _fsm.getPreviousState();
427 427
        String status = actualState.getName();
428 428

  
429 429
        if (status.equals("Polyline.NextPointOrArcOrClose")) {
......
447 447
                //closeGeometry();
448 448
            }
449 449
        }
450
  */
450 451
    }
451 452

  
452 453
    /* (non-Javadoc)
......
456 457
    }
457 458

  
458 459
    public void cancel(){
459
        endGeometry();
460
        //endGeometry();
460 461
        list.clear();
461 462
        antantPoint=antCenter=antInter=antPoint=firstPoint=null;
462 463
    }
trunk/extensions/extCAD/sm/PolylineCADTool.sm
30 30
		addPoint( pointX:double,pointY:double,event:InputEvent)
31 31
			NextPointOrArcOrClose{
32 32
				setQuestion(PluginServices.getText(this,"insert_next_point_arc_or_close"));
33
				setDescription(new String[]{"inter_arc","close","cancel"});
33
				setDescription(new String[]{"inter_arc","close_polyline","terminate","cancel"});
34 34
				addPoint( pointX,pointY,event);
35 35
				}
36 36
	}
......
40 40
		[s.equals("A") ||  s.equals("a") || s.equals(PluginServices.getText(this,"inter_arc"))]
41 41
		NextPointOrLineOrClose {
42 42
			setQuestion(PluginServices.getText(this,"insert_next_point_line_or_close"));
43
			setDescription(new String[]{"inter_line","close","cancel"});
43
			setDescription(new String[]{"inter_line","close_polyline","terminate","cancel"});
44 44
			addOption(s);
45 45
			}
46 46
	addOption(s:String)
47
		[s.equals("C") ||  s.equals("c") || s.equals(PluginServices.getText(this,"close"))]
47
		[s.equals("C") ||  s.equals("c") || s.equals(PluginServices.getText(this,"close_polyline"))]
48 48
		FirstPoint {
49 49
			addOption(s);
50 50
			closeGeometry();
51 51
			endGeometry();
52 52
			end();
53 53
			}
54
	addOption(s:String)
55
		[s.equals("T") ||  s.equals("t") || s.equals(PluginServices.getText(this,"terminate"))]
56
		FirstPoint {
57
			addOption(s);
58
			endGeometry();
59
			end();
60
			}
54 61
	addPoint( pointX:double,pointY:double,event:InputEvent)
55 62
		NextPointOrArcOrClose {
56 63
			setQuestion(PluginServices.getText(this,"insert_next_point_arc_or_close"));
57
			setDescription(new String[]{"inter_arc","close","cancel"});
64
			setDescription(new String[]{"inter_arc","close_polyline","terminate","cancel"});
58 65
			addPoint( pointX,pointY,event);
59 66
			}
60 67
}
......
62 69
	addPoint( pointX:double,pointY:double,event:InputEvent)
63 70
		NextPointOrLineOrClose {
64 71
			setQuestion(PluginServices.getText(this,"insert_next_point_line_or_close"));
65
			setDescription(new String[]{"inter_line","close","cancel"});
72
			setDescription(new String[]{"inter_line","close_polyline","terminate","cancel"});
66 73
			addPoint( pointX,pointY,event);
67 74
			}
68 75
	addOption(s:String)
69 76
		[s.equals("N") ||  s.equals("n") || s.equals(PluginServices.getText(this,"inter_line"))]
70 77
		NextPointOrArcOrClose {
71 78
			setQuestion(PluginServices.getText(this,"insert_next_point_arc_or_close"));
72
			setDescription(new String[]{"inter_arc","close","cancel"});
79
			setDescription(new String[]{"inter_arc","close_polyline","terminate","cancel"});
73 80
			addOption(s);
74 81
			}
75 82
	addOption(s:String)
76
		[s.equals("C") ||  s.equals("c") || s.equals(PluginServices.getText(this,"close"))]
83
		[s.equals("C") ||  s.equals("c") || s.equals(PluginServices.getText(this,"close_polyline"))]
77 84
		FirstPoint {
78 85
			addOption(s);
79 86
			closeGeometry();
80 87
			endGeometry();
81 88
			end();
82 89
			}
90
	addOption(s:String)
91
		[s.equals("T") ||  s.equals("t") || s.equals(PluginServices.getText(this,"terminate"))]
92
		FirstPoint {
93
			addOption(s);
94
			endGeometry();
95
			end();
96
			}
97

  
83 98
}
84 99

  
85 100
Default
trunk/extensions/extCAD/text.properties
9 9
circle_=C?RCULO
10 10
circumscribed=Circunscrito
11 11
close=Cerrar
12
close_polyline=Cerrar polil?nea
12 13
commands_stack=Pila de comandos
13 14
complex_selection=Selecci?n compleja
14 15
complex_selection_=SELECCI?N COMPLEJA
......
56 57
insert_last_point_reference=Precise punto final recta referencia
57 58
insert_last_point_scale=Precise punto final recta escala
58 59
insert_length_or_point=Insertar longitud o punto
59
insert_next_point_arc_or_close=Insertar siguiente punto, Arco[A] o Cerrar[C]
60
insert_next_point_line_or_close=Insertar punto siguiente, Linea[N] o Cerrar[C]
60
insert_next_point_arc_or_close=Insertar siguiente punto, Arco[A] o Cerrar polil?nea[C] o Terminar[T]
61
insert_next_point_line_or_close=Insertar punto siguiente, Linea[N], Cerrar polil?nea[C] o Terminar[T]
61 62
insert_next_point_selection_or_end_polygon=Insertar siguiente punto o finalizar pol?gono de selecci?n[E]
62 63
insert_number_sides=Insertar n?mero de lados
63 64
insert_opposited_corner=Insertar esquina opuesta
......
78 79
inside_circle=Dentro de la circunferencia
79 80
inside_polygon=Dentro del pol?gono
80 81
inter_arc=Arco interno
81
inter_line=L?ne interna
82
inter_line=L?nea interna
82 83
internal_polygon_=Pol?gono interno
83 84
into_circle=Inscrito
84 85
into_circle_or_circumscribed=Inscrito en el c?rculo[I] o Circunscrito[C]<C>
......
137 138
stop_edition=Terminar edici?n
138 139
stretch=Estirar
139 140
symmetry=Simetr?a
141
terminate=Terminar
140 142
theme=Tema
141 143
trim=Recortar
142 144
type=Tipo

Also available in: Unified diff