Ticket #7952: antialiasing_v0-5538.patch

src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -67 +67 @@
     private JTextField waypointLabelPattern = new JTextField();
     private JosmComboBox audioWaypointLabel = new JosmComboBox(LABEL_PATTERN_DESC);
     private JTextField audioWaypointLabelPattern = new JTextField();
+    private JCheckBox useGpsAntialiasing = new JCheckBox(tr("Smooth GPX graphics (antialiasing)"));
 
     private String layerName;
     private boolean local; // flag to display LocalOnly checkbox
@@ -196 +197 @@
         add(new JLabel(tr("Drawing width of GPX lines")), GBC.std().insets(20,0,0,0));
         add(drawLineWidth, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
+        // antialiasing
+        useGpsAntialiasing.setToolTipText(tr("Apply antialiasing to the GPX lines resulting in a smoother appearance."));
+        add(useGpsAntialiasing, GBC.eop().insets(20, 0, 0, 0));
+        ExpertToggleAction.addVisibilitySwitcher(useGpsAntialiasing);
+
         // colorTracks
         colorGroup = new ButtonGroup();
         if (layerName!=null) {
@@ -320 +326 @@
         drawGpsArrowsMinDist.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.min-arrow-distance",layerName, 40)));
         hdopCircleGpsPoints.setSelected(Main.pref.getBoolean("draw.rawgps.hdopcircle",layerName, false));
         largeGpsPoints.setSelected(Main.pref.getBoolean("draw.rawgps.large",layerName, false));
+        useGpsAntialiasing.setSelected(Main.pref.getBoolean("mappaint.gpx.use-antialiasing", false));
         drawRawGpsLinesActionListener.actionPerformed(null);
 
         if(layerName!=null && Main.pref.get("draw.rawgps.colors."+layerName).isEmpty()) {
@@ -380 +387 @@
         Main.pref.put("draw.rawgps.hdopcircle"+layerNameDot, hdopCircleGpsPoints.isSelected());
         Main.pref.put("draw.rawgps.large"+layerNameDot, largeGpsPoints.isSelected());
         Main.pref.put("draw.rawgps.linewidth"+layerNameDot, drawLineWidth.getText());
+        Main.pref.put("mappaint.gpx.use-antialiasing", useGpsAntialiasing.isSelected());
 
         TemplateEntryProperty.forMarker(layerName).put(waypointLabelPattern.getText());
         TemplateEntryProperty.forAudioMarker(layerName).put(audioWaypointLabelPattern.getText());

src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

@@ -44 +44 @@
     private JCheckBox useHighlighting = new JCheckBox(tr("Highlight target ways and nodes"));
     private JCheckBox drawHelperLine = new JCheckBox(tr("Draw rubber-band helper line"));
     private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
+    private JCheckBox useWireframeAntialiasing = new JCheckBox(tr("Smooth map graphics in wireframe mode (antialiasing)"));
     private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas"));
 
     public void addGui(PreferenceTabbedPane gui) {
@@ -108 +109 @@
         useAntialiasing.setToolTipText(tr("Apply antialiasing to the map view resulting in a smoother appearance."));
         useAntialiasing.setSelected(Main.pref.getBoolean("mappaint.use-antialiasing", true));
 
+        // wireframe mode antialiasing
+        useWireframeAntialiasing.setToolTipText(tr("Apply antialiasing to the map view in wireframe mode resulting in a smoother appearance."));
+        useWireframeAntialiasing.setSelected(Main.pref.getBoolean("mappaint.wireframe.use-antialiasing", false));
+
         // highlighting
         useHighlighting.setToolTipText(tr("Hightlight target nodes and ways while drawing or selecting"));
         useHighlighting.setSelected(Main.pref.getBoolean("draw.target-highlight", true));
@@ -123 +128 @@
         JLabel performanceLabel = new JLabel(tr("Options that affect drawing performance"));
         panel.add(performanceLabel, GBC.eop().insets(5,10,0,0));
         panel.add(useAntialiasing, GBC.eop().insets(20,5,0,0));
+        panel.add(useWireframeAntialiasing, GBC.eop().insets(20, 0, 0, 0));
         panel.add(useHighlighting, GBC.eop().insets(20,0,0,0));
         panel.add(outlineOnly, GBC.eol().insets(20,0,0,5));
 
         ExpertToggleAction.addVisibilitySwitcher(performanceLabel);
         ExpertToggleAction.addVisibilitySwitcher(useAntialiasing);
+        ExpertToggleAction.addVisibilitySwitcher(useWireframeAntialiasing);
         ExpertToggleAction.addVisibilitySwitcher(useHighlighting);
         ExpertToggleAction.addVisibilitySwitcher(outlineOnly);
 
@@ -147 +154 @@
         Main.pref.put("draw.data.downloaded_area", sourceBounds.isSelected());
         Main.pref.put("draw.data.inactive_color", inactive.isSelected());
         Main.pref.put("mappaint.use-antialiasing", useAntialiasing.isSelected());
+        Main.pref.put("mappaint.wireframe.use-antialiasing", useWireframeAntialiasing.isSelected());
         Main.pref.put("draw.target-highlight", useHighlighting.isSelected());
         Main.pref.put("draw.helper-line", drawHelperLine.isSelected());
         int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);