Update of /cvsroot/osmose-dev/osmose/src/osmose/application/draw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23722/src/osmose/application/draw
Modified Files:
OSMDrawingPanel.java OSMDrawingToolsPanel.java
Log Message:
Eraser size (1 to 32) can be set in the drawing editor
Index: OSMDrawingToolsPanel.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMDrawingToolsPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMDrawingToolsPanel.java 30 Aug 2005 17:44:12 -0000 1.1.1.1
--- OSMDrawingToolsPanel.java 30 Jan 2006 22:35:33 -0000 1.2
***************
*** 50,54 ****
if("ERASE".equals(e.getActionCommand())) {
unSelectAllButton();
- m_Size.setEnabled(false);
m_Eraser.setSelected(true);
m_CurrentTool = OSMDRAW_ERASE;
--- 50,53 ----
***************
*** 133,137 ****
v.add("1");
v.add("2");
! v.add("3");
m_Size = new JComboBox(v);
m_ColorDisp = new OSMDrawingColorComponent(null, Color.BLACK);
--- 132,139 ----
v.add("1");
v.add("2");
! v.add("4");
! v.add("8");
! v.add("16");
! v.add("32");
m_Size = new JComboBox(v);
m_ColorDisp = new OSMDrawingColorComponent(null, Color.BLACK);
Index: OSMDrawingPanel.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/draw/OSMDrawingPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OSMDrawingPanel.java 30 Aug 2005 17:44:12 -0000 1.1.1.1
--- OSMDrawingPanel.java 30 Jan 2006 22:35:33 -0000 1.2
***************
*** 131,136 ****
m_ImgGraphic.setColor(Color.WHITE);
g.setColor(Color.WHITE);
! g.fillRect(e.getX(), e.getY(), m_EraserSize, m_EraserSize);
! m_ImgGraphic.fillRect(e.getX(), e.getY(), m_EraserSize, m_EraserSize);
}
repaint();
--- 131,137 ----
m_ImgGraphic.setColor(Color.WHITE);
g.setColor(Color.WHITE);
! int eraserSize = m_Tools.getPenSize();
! g.fillRect(e.getX(), e.getY(), eraserSize, eraserSize);
! m_ImgGraphic.fillRect(e.getX(), e.getY(), eraserSize, eraserSize);
}
repaint();
***************
*** 202,207 ****
m_ImgGraphic.setColor(Color.WHITE);
g.setColor(Color.WHITE);
! g.fillRect(e.getX(), e.getY(), m_EraserSize, m_EraserSize);
! m_ImgGraphic.fillRect(e.getX(), e.getY(), m_EraserSize, m_EraserSize);
}
else
--- 203,209 ----
m_ImgGraphic.setColor(Color.WHITE);
g.setColor(Color.WHITE);
! int eraserSize = m_Tools.getPenSize();
! g.fillRect(e.getX(), e.getY(), eraserSize, eraserSize);
! m_ImgGraphic.fillRect(e.getX(), e.getY(), eraserSize, eraserSize);
}
else
***************
*** 334,340 ****
m_DrawNeeded = false;
m_TextCompo = null;
- m_EraserSize = OSMApplication.Properties.getIntProp("OSM_DrawEraserSize");
- if((m_EraserSize < 1) || (m_EraserSize > 100))
- m_EraserSize = 1;
}
--- 336,339 ----
|
