[Bprocessor-commit] /gl/src/net/sourceforge/bprocessor/gl GLView.java, 1.49, 1.50
Status: Pre-Alpha
Brought to you by:
henryml
|
From: rimestad <rim...@us...> - 2007-01-20 21:24:57
|
Update of /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23448/src/net/sourceforge/bprocessor/gl Modified Files: GLView.java Log Message: made several smaller fixes to the scalefactor for cameras, including saving of it and visualization in attribute view... This alongside with better feedback when altering the current cam and copying cameras... Index: GLView.java =================================================================== RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/GLView.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** GLView.java 19 Jan 2007 14:18:32 -0000 1.49 --- GLView.java 20 Jan 2007 21:24:56 -0000 1.50 *************** *** 10,13 **** --- 10,14 ---- import net.sourceforge.bprocessor.gl.tool.ToolFactory; import net.sourceforge.bprocessor.gl.view.View; + import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.Observer; import net.sourceforge.bprocessor.model.Project; *************** *** 188,191 **** --- 189,198 ---- */ public void repaint() { + if (Project.getInstance().getCurrentCamera().getType() == Camera.PERSPECTIVE) { + disableFactor(); + } else { + setFactor((int)Project.getInstance().getCurrentCamera().getFactor()); + enableFactor(); + } repaint(false); } *************** *** 314,318 **** label = new JLabel("Scale factor:"); this.add(label); ! items = new String[]{"1:1", "1:2","1:5", "1:10", "1:50", "1:100", "1:500", "1:1000"}; choices = new JComboBox(items); choices.setEditable(true); --- 321,325 ---- label = new JLabel("Scale factor:"); this.add(label); ! items = new String[]{"1:1", "1:2", "1:5", "1:10", "1:50", "1:100", "1:500", "1:1000"}; choices = new JComboBox(items); choices.setEditable(true); |