Ignore:
Timestamp:
2009-02-08T20:34:53+01:00 (16 years ago)
Author:
pieren
Message:

Fix minor issues.

Location:
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java

    r13497 r13611  
    6262            openInterface();
    6363        } catch (IOException e) {
    64             e.printStackTrace();
     64            JOptionPane.showMessageDialog(Main.parent,
     65                    tr("Town/city {0} not found or not available in WMS.\n" +
     66                                "Please check its availibility on www.cadastre.gouv.fr", wmsLayer.getLocation()));
    6567            return false;
    6668        }
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java

    r13545 r13611  
    6666 * 0.9 05-Feb-2009 - grab vectorized full commune bbox, save in file, convert to OSM way
    6767 *                   and simplify
     68 * 1.0 05-Feb-2009 - fix various bugs
    6869 */
    6970public class CadastrePlugin extends Plugin {
    70     static String VERSION = "0.8";
     71    static String VERSION = "1.0";
    7172
    7273    static JMenu cadastreJMenu;
     
    153154            JMenuItem menuLoadFromCache = new JMenuItem(new MenuActionLoadFromCache());
    154155            JMenuItem menuActionBoundaries = new JMenuItem(new MenuActionBoundaries());
     156            JMenuItem menuActionBuildings = new JMenuItem(new MenuActionBuildings());
    155157           
    156158            cadastreJMenu.add(menuGrab);
     
    161163            cadastreJMenu.add(menuLoadFromCache);
    162164            cadastreJMenu.add(menuActionBoundaries);
     165            //cadastreJMenu.add(menuActionBuildings);
    163166        }
    164167        setEnabledAll(menuEnabled);
     
    191194            if (item != null)
    192195                if (item.getText().equals(MenuActionGrab.name) ||
    193                     item.getText().equals(MenuActionBoundaries.name)) {
     196                    item.getText().equals(MenuActionBoundaries.name) ||
     197                    item.getText().equals(MenuActionBuildings.name)) {
    194198                    item.setEnabled(isEnabled);
    195199                } else if (item.getText().equals(MenuActionLambertZone.name)) {
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java

    r13545 r13611  
    8181            l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10);
    8282            p.add(new JScrollPane(l), GBC.eol().fill());
    83             boolean bContinue = JOptionPane.showConfirmDialog(Main.parent, p, tr("Add \"source=Cadastre...\" to ?"),
    84                     JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
     83            boolean bContinue = JOptionPane.showConfirmDialog(Main.parent, p, tr("Add \"source=...\" to elements?"),
     84                   JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
    8585            if (bContinue)
    8686                Main.main.undoRedo.add(new ChangePropertyCommand(sel, "source", CadastrePlugin.source));
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java

    r13545 r13611  
    9595    private void createWay(String svg) {
    9696        String[] SVGpaths = new SVGParser().getPaths(svg);
    97         //double[] fitViewBox = new double[SVGpaths.length];
    9897        ArrayList<Double> fitViewBox = new ArrayList<Double>(); 
    9998        ArrayList<ArrayList<EastNorth>> eastNorths = new ArrayList<ArrayList<EastNorth>>();
    10099        for (int i=0; i< SVGpaths.length; i++) {
    101100            ArrayList<EastNorth> eastNorth = new ArrayList<EastNorth>();
    102             fitViewBox.add( createNodes(SVGpaths[i], eastNorth) );;
     101            fitViewBox.add( createNodes(SVGpaths[i], eastNorth) );
    103102            eastNorths.add(eastNorth);
    104103        }
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/EastNorthBound.java

    r13545 r13611  
    2323    }
    2424
     25    public EastNorthBound interpolate(EastNorthBound en2, double proportion) {
     26        EastNorthBound enb = new EastNorthBound(this.min.interpolate(en2.min, proportion),
     27                this.max.interpolate(en2.max, proportion));
     28        return enb;
     29    }
     30
    2531    @Override public String toString() {
    2632        return "EastNorthBound[" + min.east() + "," + min.north() + "," + max.east() + "," + max.north() + "]";
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java

    r13545 r13611  
    2828    public ImageModifier(BufferedImage bi) {
    2929        bufferedImage = bi;
    30         System.out.println("cadastrewms.alterColors="+Main.pref.getBoolean("cadastrewms.alterColors"));
    31         System.out.println("cadastrewms.backgroundTransparent="+Main.pref.getBoolean("cadastrewms.backgroundTransparent"));
    3230        if (Main.pref.getBoolean("cadastrewms.alterColors")) {
    3331            changeColors();
     
    4947        int josmBackgroundColor = ColorHelper.html2color(Main.pref.get("color.background", "#FFFFFF")).getRGB();
    5048        boolean invertGrey = (Main.pref.getBoolean("cadastrewms.invertGrey"));
    51         System.out.println("cadastrewms.invertGrey="+invertGrey);
    52         System.out.println("color.background="+Main.pref.get("color.background", "#FFFFFF"));
    5349        for (int x = 0; x < w; x++) {
    5450            for (int y = 0; y < h; y++) {
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java

    r13497 r13611  
    2929    public void actionPerformed(ActionEvent e) {
    3030        JPanel p = new JPanel(new GridBagLayout());
    31         String[] zones = { "", "1 (51.30° to 48.15°)", "2 (48.15° to 45.45°)", "3 (45.45° to 42.76°)", "4 (Corsica)" };
     31        String[] zones = { "", "1 (51.30 to 48.15 degrees)", "2 (48.15 to 45.45 degrees)", "3 (45.45 to 42.76 degrees)", "4 (Corsica)" };
    3232        final JComboBox inputLambertZone = new JComboBox(zones);
    3333        JLabel newLambertZone = new JLabel(tr("Zone"));
Note: See TracChangeset for help on using the changeset viewer.