Changeset 22387 in osm for applications
- Timestamp:
- 2010-07-19T21:06:52+02:00 (14 years ago)
- Location:
- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java
r22230 r22387 89 89 JLabel link = new JLabel(); 90 90 private Way selectedWay; 91 //private Relation selectedRelation;92 91 private boolean shift; 92 private boolean ctrl; 93 93 94 94 public Address(MapFrame mapFrame) { … … 121 121 return; 122 122 shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; 123 ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; 123 124 MapView mv = Main.map.mapView; 124 125 Point mousePos = e.getPoint(); … … 143 144 if (currentMouseNode.get(tagHouseStreet) != null) { 144 145 inputStreet.setText(currentMouseNode.get(tagHouseStreet)); 146 if (ctrl) { 147 Collection<Command> cmds = new LinkedList<Command>(); 148 addAddrToPrimitive(currentMouseNode, cmds); 149 applyInputNumberChange(); 150 } 145 151 setSelectedWay((Way)null); 146 152 } else { -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java
r22041 r22387 59 59 final String cInterfaceRasterFeuille = "afficherCarteFeuille.do"; 60 60 final String cImageLinkStart = "title=\"image\"><a href=\"#\" onClick=\"popup('afficherCarteFeuille.do?f="; 61 final String cTAImageLinkStart = "title=\"image\"><a href=\"#\" onClick=\"popup('afficherCarteTa.do?f="; 61 62 final String cImageNameStart = ">Feuille "; 63 final String cTAImageNameStart = "Tableau d'assemblage <strong>"; 62 64 63 65 final static long cCookieExpiration = 30 * 60 * 1000; // 30 minutes expressed in milliseconds … … 380 382 private void parseFeuillesList(String input) { 381 383 listOfFeuilles.clear(); 384 // get "Tableau d'assemblage" 385 if (Main.pref.getBoolean("cadastrewms.useTA", false)) { 386 while (input.indexOf(cTAImageLinkStart) != -1) { 387 input = input.substring(input.indexOf(cTAImageLinkStart) + cTAImageLinkStart.length()); 388 String refTA = input.substring(0, input.indexOf("'")); 389 String nameTA = input.substring(input.indexOf(cTAImageNameStart) + cTAImageNameStart.length()); 390 nameTA = nameTA.substring(0, nameTA.indexOf("<")); 391 listOfFeuilles.add(new PlanImage(nameTA, refTA)); 392 } 393 } 394 // get "Feuilles" 382 395 while (input.indexOf(cImageLinkStart) != -1) { 383 396 input = input.substring(input.indexOf(cImageLinkStart)+cImageLinkStart.length()); -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java
r22041 r22387 115 115 * - add 'departement' as option in the municipality selection 116 116 * - fixed bug in cache directory size control (and disabled by default) 117 * - add map mode for addressing 118 * - from Nicolas Dumoulin: 119 * - add "tableau d'assemblage" in raster images for georeferencing (as option) 117 120 */ 118 121 public class CadastrePlugin extends Plugin { -
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
r22230 r22387 40 40 41 41 private JCheckBox disableImageCropping = new JCheckBox(tr("Disable image cropping during georeferencing.")); 42 43 private JCheckBox enableTableauAssemblage = new JCheckBox(tr("Use \"Tableau d''assemblage\"")); 42 44 43 45 private JCheckBox autoFirstLayer = new JCheckBox(tr("Select first WMS layer in list.")); … … 287 289 disableImageCropping.setSelected(Main.pref.getBoolean("cadastrewms.noImageCropping", false)); 288 290 disableImageCropping.setToolTipText(tr("Disable image cropping during georeferencing.")); 289 cadastrewms.add(disableImageCropping, GBC.eop().insets(0, 0, 0, 0)); 291 cadastrewms.add(disableImageCropping, GBC.std().insets(0, 0, 10, 0)); 292 // option to add the "Tableau d'assemblage" in list of sheets to grab 293 enableTableauAssemblage.setSelected(Main.pref.getBoolean("cadastrewms.useTA", false)); 294 enableTableauAssemblage.setToolTipText(tr("Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab.")); 295 cadastrewms.add(enableTableauAssemblage, GBC.eop().insets(0, 0, 0, 0)); 290 296 // the crosspiece display 291 297 JLabel jLabelCrosspieces = new JLabel(tr("Display crosspieces:")); … … 401 407 } 402 408 Main.pref.put("cadastrewms.noImageCropping", disableImageCropping.isSelected()); 409 Main.pref.put("cadastrewms.useTA", enableTableauAssemblage.isSelected()); 403 410 if (crosspiece1.isSelected()) Main.pref.put("cadastrewms.crosspieces", "0"); 404 411 else if (crosspiece2.isSelected()) Main.pref.put("cadastrewms.crosspieces", "1");
Note:
See TracChangeset
for help on using the changeset viewer.