bprocessor-commit Mailing List for B-processor (Page 89)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Nordholt <nor...@us...> - 2006-11-26 22:13:55
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/splash In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7581/src/net/sourceforge/bprocessor/gui/splash Modified Files: SplashWindow.java Log Message: added progressbar to the splash screen! (updates a little to fast to see though) Index: SplashWindow.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/splash/SplashWindow.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SplashWindow.java 21 Oct 2005 08:42:47 -0000 1.1 --- SplashWindow.java 26 Nov 2006 22:13:47 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- import javax.swing.ImageIcon; import javax.swing.JLabel; + import javax.swing.JProgressBar; import javax.swing.JWindow; *************** *** 22,25 **** --- 23,32 ---- */ public class SplashWindow extends JWindow { + + /** + * the progress bar + */ + private JProgressBar pb; + /** * Constructor for the SplashWindow *************** *** 33,37 **** --- 40,47 ---- URL url = cl.getResource(iconname); JLabel l = new JLabel(new ImageIcon(url)); + pb = new JProgressBar(); + pb.setMaximum(100); getContentPane().add(l, BorderLayout.CENTER); + getContentPane().add(pb, BorderLayout.SOUTH); pack(); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); *************** *** 43,45 **** --- 53,66 ---- labelSize = null; } + + /** + * increments the progressbar. + */ + public void increment() { + if (pb != null) { + + pb.setValue(pb.getValue() + 10); + } + + } } |
|
From: Nordholt <nor...@us...> - 2006-11-26 22:13:55
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7581/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: added progressbar to the splash screen! (updates a little to fast to see though) Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** GUI.java 21 Nov 2006 17:37:26 -0000 1.51 --- GUI.java 26 Nov 2006 22:13:47 -0000 1.52 *************** *** 47,51 **** import javax.swing.JSplitPane; import javax.swing.JTabbedPane; - import javax.swing.JWindow; import javax.swing.ToolTipManager; import javax.swing.JPopupMenu; --- 47,50 ---- *************** *** 75,79 **** /** The splash */ ! private JWindow plash; /** SPLIT_LEFT */ --- 74,78 ---- /** The splash */ ! private SplashWindow plash; /** SPLIT_LEFT */ *************** *** 453,456 **** --- 452,463 ---- Project.getInstance().changed(Project.getInstance()); } + /** + * increments the progress bar in the splash. + */ + public void incrementPB() { + if (plash != null) { + plash.increment(); + } + } /** |
|
From: rimestad <rim...@us...> - 2006-11-21 17:48:02
|
Update of /cvsroot/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11177 Modified Files: .classpath Log Message: removed jogl from eclipse includings Index: .classpath =================================================================== RCS file: /cvsroot/bprocessor/model/.classpath,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** .classpath 12 Nov 2006 20:35:18 -0000 1.11 --- .classpath 21 Nov 2006 17:47:53 -0000 1.12 *************** *** 6,10 **** <classpathentry exported="true" kind="lib" path="/tools/jaxb/jaxb.jar"/> <classpathentry exported="true" kind="lib" path="/tools/antlr/antlr.jar"/> - <classpathentry kind="lib" path="/tools/jogl/jogl.jar"/> <classpathentry kind="lib" path="/tools/junit/junit.jar"/> <classpathentry exported="true" kind="lib" path="xml"/> --- 6,9 ---- |
|
From: rimestad <rim...@us...> - 2006-11-21 17:44:23
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9698/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceTool.java Log Message: added some needed change events Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** SpaceTool.java 13 Nov 2006 12:22:30 -0000 1.66 --- SpaceTool.java 21 Nov 2006 17:44:05 -0000 1.67 *************** *** 321,324 **** --- 321,325 ---- glv.getView().makeTarget(null); Project.getInstance().setActiveSpace(space); + Project.getInstance().changed(Project.getInstance()); } } *************** *** 707,710 **** --- 708,712 ---- Project.getInstance().delete(edges); Project.getInstance().delete(vertices); + Project.getInstance().changed(Project.getInstance()); Project.getInstance().checkpoint(); } *************** *** 716,720 **** Selection.primary().clear(); glv.getView().makeTarget(null); ! Project.getInstance().setActiveSpace(null); } } --- 718,724 ---- Selection.primary().clear(); glv.getView().makeTarget(null); ! Project p = Project.getInstance(); ! p.setActiveSpace(null); ! p.changed(p); } } |
|
From: rimestad <rim...@us...> - 2006-11-21 17:43:35
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9456/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: made it more obvious Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** Project.java 19 Nov 2006 21:48:57 -0000 1.96 --- Project.java 21 Nov 2006 17:43:30 -0000 1.97 *************** *** 204,207 **** --- 204,208 ---- */ public void changed(Object entity) { + log.info("Changed call on " + entity); Iterator iter = observers.iterator(); while (iter.hasNext()) { *************** *** 225,229 **** this.cameraId = 0; cs.setActive(true); - changed(this); } --- 226,229 ---- *************** *** 241,245 **** } } - changed(this); } --- 241,244 ---- *************** *** 251,255 **** constraints.add(constraint); constraint.setId(new Long(constraints.size())); - changed(this); } --- 250,253 ---- *************** *** 260,264 **** public void delete(Constraint constraint) { remove(constraint); - changed(this); } --- 258,261 ---- *************** *** 373,377 **** public void add(Material material) { world.add(material); - changed(this); } --- 370,373 ---- *************** *** 390,394 **** public void delete(Material material) { remove(material); - changed(this); } --- 386,389 ---- *************** *** 417,421 **** c.setId(new Long(cameraId++)); cameras.put(c.getId(), c); - changed(this); } --- 412,415 ---- *************** *** 427,431 **** cameras.remove(c.getId()); c.setId(null); - changed(this); } --- 421,424 ---- *************** *** 471,475 **** public void setActiveSpace(Space space) { activeSpace = space; - changed(this); } --- 464,467 ---- |
|
From: rimestad <rim...@us...> - 2006-11-21 17:42:19
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9058/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Log Message: made it more obvious Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Persistence.java 19 Nov 2006 21:48:57 -0000 1.24 --- Persistence.java 21 Nov 2006 17:42:17 -0000 1.25 *************** *** 111,119 **** } } ! Project.getInstance().setWorld(world); ! Project.getInstance().setActiveCoordinateSystem( (CoordinateSystem) get(document.getCs(), mapper)); ! Project.getInstance().setActiveSpace((Space) get(document.getActive(), mapper)); ! Project.getInstance().setName(document.getName()); } --- 111,121 ---- } } ! Project p = Project.getInstance(); ! p.setWorld(world); ! p.setActiveCoordinateSystem( (CoordinateSystem) get(document.getCs(), mapper)); ! p.setActiveSpace((Space) get(document.getActive(), mapper)); ! p.setName(document.getName()); ! p.changed(p); } |
|
From: rimestad <rim...@us...> - 2006-11-21 17:38:27
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7429/src/net/sourceforge/bprocessor/gl/tool Modified Files: CameraFlyTool.java CameraWalkTool.java Log Message: repaired fly and walk tools Index: CameraWalkTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraWalkTool.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CameraWalkTool.java 7 Sep 2006 13:35:19 -0000 1.5 --- CameraWalkTool.java 21 Nov 2006 17:38:25 -0000 1.6 *************** *** 75,79 **** * @param e The KeyEvent */ ! public void key(KeyEvent e) { Camera c = Project.getInstance().getCurrentCamera(); Vertex up = new Vertex(c.getRoll()[0], c.getRoll()[1], c.getRoll()[2]); --- 75,79 ---- * @param e The KeyEvent */ ! public void keyPressed(KeyEvent e) { Camera c = Project.getInstance().getCurrentCamera(); Vertex up = new Vertex(c.getRoll()[0], c.getRoll()[1], c.getRoll()[2]); *************** *** 94,97 **** --- 94,99 ---- } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) { c.translate(new double[] {-sidewards.getX(), -sidewards.getY(), 0}); + } else { + super.keyPressed(e); } Project.getInstance().changed(c); Index: CameraFlyTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraFlyTool.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CameraFlyTool.java 7 Sep 2006 13:35:19 -0000 1.7 --- CameraFlyTool.java 21 Nov 2006 17:38:25 -0000 1.8 *************** *** 75,79 **** * @param e The KeyEvent */ ! public void key(KeyEvent e) { Camera c = Project.getInstance().getCurrentCamera(); Vertex up = new Vertex(c.getRoll()[0], c.getRoll()[1], c.getRoll()[2]); --- 75,80 ---- * @param e The KeyEvent */ ! public void keyPressed(KeyEvent e) { ! log.info("Fly keyevent"); Camera c = Project.getInstance().getCurrentCamera(); Vertex up = new Vertex(c.getRoll()[0], c.getRoll()[1], c.getRoll()[2]); *************** *** 94,97 **** --- 95,100 ---- } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) { c.translate(new double[] {-sidewards.getX(), -sidewards.getY(), -sidewards.getZ()}); + } else { + super.keyPressed(e); } Project.getInstance().changed(c); |
|
From: rimestad <rim...@us...> - 2006-11-21 17:37:29
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6985/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: disabled import export, they does not do anything meaningfull Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** GUI.java 12 Nov 2006 23:00:34 -0000 1.50 --- GUI.java 21 Nov 2006 17:37:26 -0000 1.51 *************** *** 184,187 **** --- 184,188 ---- fileImport.addActionListener(new FileImportActionListener()); fileImport.setMnemonic(KeyEvent.VK_I); + fileImport.setEnabled(false); file.add(fileImport); *************** *** 189,192 **** --- 190,194 ---- fileExport.addActionListener(new FileExportActionListener()); fileExport.setMnemonic(KeyEvent.VK_E); + fileExport.setEnabled(false); file.add(fileExport); |
|
From: rimestad <rim...@us...> - 2006-11-21 17:36:57
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6586/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java Log Message: fix to the tree so that a large altering of the model does work... Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** GenericTreeView.java 15 Nov 2006 13:47:52 -0000 1.63 --- GenericTreeView.java 21 Nov 2006 17:36:55 -0000 1.64 *************** *** 520,526 **** private static final long serialVersionUID = 1L; - /** The current space*/ - private Space current; - /** * Constructor for SpaceNode --- 520,523 ---- *************** *** 529,533 **** public SpaceNode(Space space) { super(space); - current = space; Set surfaces = space.getEnvelope(); add(new SurfaceContainer("Surfaces", surfaces)); --- 526,529 ---- *************** *** 550,555 **** if (o instanceof Space) { Space s = (Space)o; ! current = s; ! if (updated == current) { model.nodeChanged(this); } --- 546,551 ---- if (o instanceof Space) { Space s = (Space)o; ! userObject = s; ! if (updated == s) { model.nodeChanged(this); } *************** *** 582,587 **** */ public String toString() { ! String nid = current.getDisplayName(); ! if (GUI.getInstance().isClosed(current)) { nid += " (C)"; } else { --- 578,583 ---- */ public String toString() { ! String nid = ((Space)userObject).getDisplayName(); ! if (GUI.getInstance().isClosed(((Space)userObject))) { nid += " (C)"; } else { *************** *** 596,600 **** */ public ImageIcon icon() { ! if (current.isConstructionSpace()) { return constructionspaceicon; } else { --- 592,596 ---- */ public ImageIcon icon() { ! if (((Space)userObject).isConstructionSpace()) { return constructionspaceicon; } else { *************** *** 1040,1045 **** if (o instanceof Project) { Project proj = (Project)o; if (proj == updated) { - userObject = proj; model.nodeChanged(this); } --- 1036,1041 ---- if (o instanceof Project) { Project proj = (Project)o; + userObject = proj; if (proj == updated) { model.nodeChanged(this); } *************** *** 1346,1349 **** --- 1342,1346 ---- */ public void update(Object object) { + log.info("changed"); updated = object; update(); |
|
From: rimestad <rim...@us...> - 2006-11-21 17:29:51
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3787/src/net/sourceforge/bprocessor/gui/actions Modified Files: FileNewActionListener.java FileExitActionListener.java FileLoadActionListener.java FileImportActionListener.java FileCloseActionListener.java FileSaveAsActionListener.java Added Files: FileActionListener.java Log Message: the 6 repitition of the same save code have bee refactored into FileActionListener which is abstract and the 6 old files now extends instead implementing additionalAction which does the individual job, gives lesser coupling and heigher cohesion Index: FileLoadActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileLoadActionListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileLoadActionListener.java 21 Mar 2006 12:24:13 -0000 1.6 --- FileLoadActionListener.java 21 Nov 2006 17:29:34 -0000 1.7 *************** *** 10,18 **** import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; import java.io.File; import javax.swing.JFileChooser; - import javax.swing.JOptionPane; import org.apache.log4j.Logger; --- 10,16 ---- *************** *** 21,25 **** * The file->load action listener */ ! public class FileLoadActionListener implements ActionListener { /** The logger */ private static Logger log = Logger.getLogger(FileLoadActionListener.class); --- 19,23 ---- * The file->load action listener */ ! public class FileLoadActionListener extends FileActionListener { /** The logger */ private static Logger log = Logger.getLogger(FileLoadActionListener.class); *************** *** 30,117 **** public FileLoadActionListener() { } ! /** ! * Action performed ! * @param e The action event */ ! public void actionPerformed(ActionEvent e) { ! ! if (Project.getInstance().isDirty()) { ! int n = JOptionPane.showConfirmDialog( ! null, ! "Do you want to save the changes?", ! "Projekt has been changed", ! JOptionPane.YES_NO_CANCEL_OPTION); ! if (n == 0) { ! JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath()); ! chooser.addChoosableFileFilter(new MyFileFilter()); ! ! int state = chooser.showSaveDialog(null); ! File file = chooser.getSelectedFile(); ! ! if (file != null && ! state == JFileChooser.APPROVE_OPTION) { ! try { ! Project.getInstance().setDefaultPath(file.getAbsolutePath()); ! if (file.getName().lastIndexOf('.') != -1) { ! Project.getInstance().saveAs(file); ! } else { ! Project.getInstance().saveAs(new File(file.getCanonicalFile() + ".bp")); ! } ! ! JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath()); ! loadChooser.addChoosableFileFilter(new MyFileFilter()); ! int lstate = loadChooser.showOpenDialog(null); ! File lfile = loadChooser.getSelectedFile(); ! if (lfile != null && ! lstate == JFileChooser.APPROVE_OPTION) { ! try { ! Project.getInstance().load(lfile); ! } catch (Exception ex) { ! log.error("Could not open file: " + lfile, ex); ! } ! } ! } catch (Exception ex) { ! log.error("Could not save to file: " + file, ex); ! } ! } ! } ! ! if (n == 1) { ! JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath()); ! loadChooser.addChoosableFileFilter(new MyFileFilter()); ! int lstate = loadChooser.showOpenDialog(null); ! File lfile = loadChooser.getSelectedFile(); ! if (lfile != null && ! lstate == JFileChooser.APPROVE_OPTION) { ! try { ! Project.getInstance().load(lfile); ! } catch (Exception ex) { ! log.error("Could not open file: " + lfile, ex); ! } ! } ! } ! ! ! } else { ! ! JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath()); ! loadChooser.addChoosableFileFilter(new MyFileFilter()); ! int lstate = loadChooser.showOpenDialog(null); ! File lfile = loadChooser.getSelectedFile(); ! if (lfile != null && ! lstate == JFileChooser.APPROVE_OPTION) { ! try { ! Project.getInstance().load(lfile); ! } catch (Exception ex) { ! log.error("Could not open file: " + lfile, ex); ! } } } - - - - - } } --- 28,49 ---- public FileLoadActionListener() { } ! /** ! * The action to perform after the standard file action ! * @param e the original event */ ! public void additionalAction(ActionEvent e) { ! JFileChooser loadChooser = new JFileChooser(Project.getInstance().getDefaultPath()); ! loadChooser.addChoosableFileFilter(new MyFileFilter()); ! int lstate = loadChooser.showOpenDialog(null); ! File lfile = loadChooser.getSelectedFile(); ! if (lfile != null && ! lstate == JFileChooser.APPROVE_OPTION) { ! try { ! Project.getInstance().load(lfile); ! } catch (Exception ex) { ! log.error("Could not open file: " + lfile, ex); } } } } Index: FileExitActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileExitActionListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileExitActionListener.java 21 Mar 2006 12:24:13 -0000 1.6 --- FileExitActionListener.java 21 Nov 2006 17:29:34 -0000 1.7 *************** *** 8,28 **** import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; - import java.io.File; - - import javax.swing.JFileChooser; - import javax.swing.JOptionPane; - - import net.sourceforge.bprocessor.model.Project; - - import org.apache.log4j.Logger; /** * The file->exit action listener */ ! public class FileExitActionListener implements ActionListener { ! /** The logger */ ! private static Logger log = Logger.getLogger(FileExitActionListener.class); ! /** * FileExitActionListener --- 8,16 ---- import java.awt.event.ActionEvent; /** * The file->exit action listener */ ! public class FileExitActionListener extends FileActionListener { /** * FileExitActionListener *************** *** 32,75 **** /** ! * Action performed ! * @param e The action event */ ! public void actionPerformed(ActionEvent e) { ! if (Project.getInstance().isDirty()) { ! int n = JOptionPane.showConfirmDialog( ! null, ! "Do you want to save the changes?", ! "Project has been changed", ! JOptionPane.YES_NO_CANCEL_OPTION); ! if (n == 0) { ! if (Project.getInstance().getSavePath() == null) { ! JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath()); ! chooser.addChoosableFileFilter(new MyFileFilter()); ! int state = chooser.showSaveDialog(null); ! File file = chooser.getSelectedFile(); ! if (file != null && ! state == JFileChooser.APPROVE_OPTION) { ! try { ! Project.getInstance().saveAs(file); ! System.exit(0); ! } catch (Exception ex) { ! log.error("Could not save to file: " + file, ex); ! } ! } ! } else { ! try { ! Project.getInstance().save(); ! System.exit(0); ! } catch (Exception ex) { ! log.error("Could not save to file: " + ! new File(Project.getInstance().getSavePath()), ex); ! } ! } ! } else if (n == 1) { ! System.exit(0); ! } ! } else { ! System.exit(0); ! } } } --- 20,28 ---- /** ! * The action to perform after the standard file action ! * @param e the original event */ ! public void additionalAction(ActionEvent e) { ! System.exit(0); } } Index: FileCloseActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileCloseActionListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileCloseActionListener.java 21 Mar 2006 12:24:13 -0000 1.6 --- FileCloseActionListener.java 21 Nov 2006 17:29:34 -0000 1.7 *************** *** 9,19 **** import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; - import java.io.File; - - import javax.swing.JFileChooser; - import javax.swing.JOptionPane; - - import org.apache.log4j.Logger; import net.sourceforge.bprocessor.model.Project; --- 9,12 ---- *************** *** 23,31 **** */ ! public class FileCloseActionListener implements ActionListener { ! ! /** The logger */ ! private static Logger log = Logger.getLogger(FileCloseActionListener.class); ! /** * Constructs the FileCloseActionListner --- 16,20 ---- */ ! public class FileCloseActionListener extends FileActionListener { /** * Constructs the FileCloseActionListner *************** *** 36,87 **** /** ! * Clears the project ! * @param event The event */ ! public void actionPerformed(ActionEvent event) { ! if (Project.getInstance().isDirty()) { ! int n = JOptionPane.showConfirmDialog( ! null, ! "Do you want to save the changes?", ! "Project has been changed", ! JOptionPane.YES_NO_CANCEL_OPTION); ! if (n == 0) { ! if (Project.getInstance().getSavePath() == null) { ! String path = Project.getInstance().getDefaultPath(); ! JFileChooser chooser = new JFileChooser(path); ! chooser.addChoosableFileFilter(new MyFileFilter()); ! int state = chooser.showSaveDialog(null); ! File file = chooser.getSelectedFile(); ! if (file != null && ! state == JFileChooser.APPROVE_OPTION) { ! try { ! ! if (file.getName().lastIndexOf('.') != -1) { ! Project.getInstance().saveAs(file); ! } else { ! Project.getInstance().saveAs(new File(file.getCanonicalFile() + ".bp")); ! } ! Project.getInstance().close(); ! } catch (Exception ex) { ! log.error("Could not save to file: " + file, ex); ! } ! } ! } else { ! try { ! Project.getInstance().save(); ! Project.getInstance().close(); ! } catch (Exception ex) { ! log.error("Could not export to file: " + ! new File(Project.getInstance().getSavePath()), ex); ! } ! } ! } ! ! if (n == 1) { ! Project.getInstance().close(); ! } ! } else { ! Project.getInstance().close(); ! } } } --- 25,33 ---- /** ! * The action to perform after the standard file action ! * @param e the original event */ ! public void additionalAction(ActionEvent e) { ! Project.getInstance().close(); } } Index: FileNewActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileNewActionListener.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FileNewActionListener.java 13 Oct 2006 15:47:34 -0000 1.8 --- FileNewActionListener.java 21 Nov 2006 17:29:34 -0000 1.9 *************** *** 9,19 **** import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; - import java.io.File; - - import javax.swing.JFileChooser; - import javax.swing.JOptionPane; - - import org.apache.log4j.Logger; import net.sourceforge.bprocessor.model.Project; --- 9,12 ---- *************** *** 23,30 **** */ ! public class FileNewActionListener implements ActionListener { ! ! /** The logger */ ! private static Logger log = Logger.getLogger(FileCloseActionListener.class); /** --- 16,20 ---- */ ! public class FileNewActionListener extends FileActionListener { /** *************** *** 36,86 **** /** ! * Clears the project ! * @param event The event */ ! public void actionPerformed(ActionEvent event) { ! ! if (Project.getInstance().isDirty()) { ! int n = JOptionPane.showConfirmDialog( ! null, ! "Do you want to save the changes?", ! "Projekt has been changed", ! JOptionPane.YES_NO_CANCEL_OPTION); ! if (n == JOptionPane.YES_OPTION) { ! if (Project.getInstance().getSavePath() == null) { ! JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath()); ! chooser.addChoosableFileFilter(new MyFileFilter()); ! int state = chooser.showSaveDialog(null); ! File file = chooser.getSelectedFile(); ! if (file != null && ! state == JFileChooser.APPROVE_OPTION) { ! try { ! if (file.getName().lastIndexOf('.') != -1) { ! Project.getInstance().saveAs(file); ! } else { ! Project.getInstance().saveAs(new File(file.getCanonicalFile() + ".bp")); ! } ! Project.getInstance().close(); ! } catch (Exception ex) { ! log.error("Could not export to file: " + file, ex); ! } ! } ! } else { ! try { ! Project.getInstance().save(); ! Project.getInstance().close(); ! } catch (Exception ex) { ! log.error("Could not export to file: " + ! new File(Project.getInstance().getSavePath()), ex); ! } ! } ! } ! if (n == JOptionPane.NO_OPTION) { ! Project.getInstance().close(); ! } ! } else { ! Project.getInstance().close(); ! } } - } --- 26,35 ---- /** ! * The action to perform after the standard file action ! * @param e the original event */ ! public void additionalAction(ActionEvent e) { ! Project.getInstance().close(); ! Project.getInstance().changed(Project.getInstance()); } } Index: FileSaveAsActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileSaveAsActionListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FileSaveAsActionListener.java 21 Mar 2006 12:24:13 -0000 1.4 --- FileSaveAsActionListener.java 21 Nov 2006 17:29:34 -0000 1.5 *************** *** 49,53 **** } } catch (Exception ex) { ! log.error("Could not export to file: " + file, ex); } } --- 49,53 ---- } } catch (Exception ex) { ! log.error("Could not save to file: " + file, ex); } } Index: FileImportActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileImportActionListener.java 5 Apr 2006 09:35:50 -0000 1.2 --- FileImportActionListener.java 21 Nov 2006 17:29:34 -0000 1.3 *************** *** 6,16 **** //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.gui.actions; - - import net.sourceforge.bprocessor.model.Persistence; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - import java.io.File; - - import javax.swing.JFileChooser; import org.apache.log4j.Logger; --- 6,11 ---- *************** *** 34,49 **** */ public void actionPerformed(ActionEvent e) { ! JFileChooser chooser = new JFileChooser(); ! int state = chooser.showOpenDialog(null); ! File file = chooser.getSelectedFile(); ! ! if (file != null && ! state == JFileChooser.APPROVE_OPTION) { ! try { ! Persistence.load(file); ! } catch (Exception ex) { ! log.error("Could not import file: " + file, ex); ! } ! } } } --- 29,33 ---- */ public void actionPerformed(ActionEvent e) { ! //TODO implement me } } --- NEW FILE: FileActionListener.java --- //--------------------------------------------------------------------------------- // $Id: FileActionListener.java,v 1.1 2006/11/21 17:29:34 rimestad Exp $ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.gui.actions; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; import javax.swing.JFileChooser; import javax.swing.JOptionPane; import org.apache.log4j.Logger; import net.sourceforge.bprocessor.model.Project; /** * The FileCloseActionListener */ public abstract class FileActionListener implements ActionListener { /** The logger */ private static Logger log = Logger.getLogger(FileActionListener.class); /** * Constructs the FileCloseActionListner */ public FileActionListener() { super(); } /** * Clears the project * @param event The event */ public void actionPerformed(ActionEvent event) { if (Project.getInstance().isDirty()) { int n = JOptionPane.showConfirmDialog( null, "Do you want to save the changes?", "Project has been changed", JOptionPane.YES_NO_CANCEL_OPTION); if (n == 0) { if (Project.getInstance().getSavePath() == null) { String path = Project.getInstance().getDefaultPath(); JFileChooser chooser = new JFileChooser(path); chooser.addChoosableFileFilter(new MyFileFilter()); int state = chooser.showSaveDialog(null); File file = chooser.getSelectedFile(); if (file != null && state == JFileChooser.APPROVE_OPTION) { try { if (file.getName().lastIndexOf('.') != -1) { Project.getInstance().saveAs(file); } else { Project.getInstance().saveAs(new File(file.getCanonicalFile() + ".bp")); } Project.getInstance().close(); } catch (Exception ex) { log.error("Could not save to file: " + file, ex); } } } else { try { Project.getInstance().save(); Project.getInstance().close(); } catch (Exception ex) { log.error("Could not save to file: " + new File(Project.getInstance().getSavePath()), ex); } } } if (n == 1) { additionalAction(event); } } else { additionalAction(event); } } /** * The action to perform when the file is saved or save is cancled * @param e The action event */ public abstract void additionalAction(ActionEvent e); } |
|
From: Michael L. <he...@us...> - 2006-11-20 10:11:24
|
Update of /cvsroot/bprocessor/build In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21811 Modified Files: build.xml Log Message: Version number updated to M8a Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** build.xml 17 Nov 2006 15:48:11 -0000 1.26 --- build.xml 20 Nov 2006 10:11:18 -0000 1.27 *************** *** 3,7 **** <target name="init"> <property name="project" value="bprocessor"/> ! <property name="version" value="M8"/> <property name="script.dir" value="${basedir}/bin"/> --- 3,7 ---- <target name="init"> <property name="project" value="bprocessor"/> ! <property name="version" value="M8a"/> <property name="script.dir" value="${basedir}/bin"/> |
|
From: Michael L. <he...@us...> - 2006-11-19 21:49:09
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11261/src/net/sourceforge/bprocessor/gl/tool Modified Files: CreateSpaceActionListener.java Log Message: Dialog circumvented Index: CreateSpaceActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CreateSpaceActionListener.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CreateSpaceActionListener.java 16 Nov 2006 23:19:32 -0000 1.12 --- CreateSpaceActionListener.java 19 Nov 2006 21:49:02 -0000 1.13 *************** *** 8,11 **** --- 8,12 ---- import net.sourceforge.bprocessor.gui.GUI; + import net.sourceforge.bprocessor.gui.attrview.AttributeView; import net.sourceforge.bprocessor.gui.attrview.ClassificationTextAttribute; *************** *** 67,74 **** /** - * Action performed * @param e The action event */ public void actionPerformed(ActionEvent e) { String result; category = null; --- 68,101 ---- /** * @param e The action event */ public void actionPerformed(ActionEvent e) { + Space owner = surface.getOwner(); + try { + Space space; + if (functional) { + space = owner.createFunctionalSpace("Unspecified"); + } else { + space = owner.createConstructionSpace("Unspecified"); + } + owner.add(space); + if (front) { + surface.setFrontDomain(space); + } else { + surface.setBackDomain(space); + } + surface.changed(); + AttributeView.instance().display(space); + Project.getInstance().checkpoint(); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + /** + * Action performed + * @param e The action event + */ + public void oldActionPerformed(ActionEvent e) { String result; category = null; |
|
From: Michael L. <he...@us...> - 2006-11-19 21:49:08
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11252/src/net/sourceforge/bprocessor/model Modified Files: Project.java Persistence.java Log Message: Dialog circumvented Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Persistence.java 19 Nov 2006 19:02:30 -0000 1.23 --- Persistence.java 19 Nov 2006 21:48:57 -0000 1.24 *************** *** 728,732 **** xml.setClassification(space.getClassification().getName()); } else { ! xml.setClassification(space.getClassification().getFullId()); } } else { --- 728,732 ---- xml.setClassification(space.getClassification().getName()); } else { ! xml.setClassification(space.getClassification().getFullId()); } } else { Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** Project.java 19 Nov 2006 20:29:03 -0000 1.95 --- Project.java 19 Nov 2006 21:48:57 -0000 1.96 *************** *** 910,914 **** if (first) { curid = st.nextToken(); ! first = false; } else { curid = st.nextToken(); --- 910,914 ---- if (first) { curid = st.nextToken(); ! first = false; } else { curid = st.nextToken(); |
|
From: Nikolaj B. <nbr...@us...> - 2006-11-19 20:29:14
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11015/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Fixed a loading issue with functional classifications Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** Project.java 17 Nov 2006 15:47:28 -0000 1.94 --- Project.java 19 Nov 2006 20:29:03 -0000 1.95 *************** *** 891,905 **** if (type == 0) { cl = constructionClas; } else { cl = functionalClas; ! } ! String curid; ! while (st.hasMoreTokens()) { ! curid = st.nextToken(); ! Iterator it = cl.getChildren().iterator(); ! while (it.hasNext()) { ! Classification current = (Classification) it.next(); ! if (curid.equalsIgnoreCase(current.getId())) { ! cl = current; } } --- 891,926 ---- if (type == 0) { cl = constructionClas; + + String curid; + while (st.hasMoreTokens()) { + curid = st.nextToken(); + Iterator it = cl.getChildren().iterator(); + while (it.hasNext()) { + Classification current = (Classification) it.next(); + if (curid.equalsIgnoreCase(current.getId())) { + cl = current; + } + } + } } else { cl = functionalClas; ! boolean first = true; ! String curid; ! while (st.hasMoreTokens()) { ! if (first) { ! curid = st.nextToken(); ! first = false; ! } else { ! curid = st.nextToken(); ! if (st.hasMoreTokens()) { ! curid = curid + "." + st.nextToken(); ! } ! } ! Iterator it = cl.getChildren().iterator(); ! while (it.hasNext()) { ! Classification current = (Classification) it.next(); ! if (curid.equalsIgnoreCase(current.getId())) { ! cl = current; ! } } } |
|
From: Nikolaj B. <nbr...@us...> - 2006-11-19 19:02:39
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8674/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Log Message: Fixed a bug in the loading and saving of classifications Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Persistence.java 16 Nov 2006 23:20:39 -0000 1.22 --- Persistence.java 19 Nov 2006 19:02:30 -0000 1.23 *************** *** 167,175 **** if (!xml.getClassification().equalsIgnoreCase("unassigned")) { if (type == 0) { ! space.setClassification(Project.getInstance(). ! getClassification(xml.getClassification(), 0)); } else { ! space.setClassification(Project.getInstance(). ! getClassification(xml.getClassification(), 1)); } } --- 167,190 ---- if (!xml.getClassification().equalsIgnoreCase("unassigned")) { if (type == 0) { ! if (xml.getClassification().startsWith("-")) { ! space.setClassification(Project.getInstance(). ! getClassification(xml.getClassification(), 0)); ! } else { ! Classification newclas = new Classification("-1", xml.getClassification(), ! Project.getInstance().getClassification("-99", 0), 0); ! Project.getInstance().getClassification("-99", 0).addChild(newclas); ! space.setClassification(newclas); ! } } else { ! if (xml.getClassification().startsWith("-")) { ! space.setClassification(Project.getInstance(). ! getClassification(xml.getClassification(), 1)); ! } else { ! Classification newclas = new Classification("-1", xml.getClassification(), ! Project.getInstance().getClassification("-99", 1), 1); ! Project.getInstance().getClassification("-99", 1).addChild(newclas); ! space.setClassification(newclas); ! } ! } } *************** *** 710,714 **** --- 725,733 ---- xml.setDescription(space.getDescription().toString()); if (space.getClassification() != null) { + if (space.getClassification().getId().equalsIgnoreCase("-1")) { + xml.setClassification(space.getClassification().getName()); + } else { xml.setClassification(space.getClassification().getFullId()); + } } else { xml.setClassification("unassigned"); |
|
From: Michael L. <he...@us...> - 2006-11-17 15:48:13
|
Update of /cvsroot/bprocessor/build In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv328 Modified Files: build.xml Log Message: Version number updated to M8 Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** build.xml 17 Nov 2006 15:04:23 -0000 1.25 --- build.xml 17 Nov 2006 15:48:11 -0000 1.26 *************** *** 3,7 **** <target name="init"> <property name="project" value="bprocessor"/> ! <property name="version" value="M7"/> <property name="script.dir" value="${basedir}/bin"/> --- 3,7 ---- <target name="init"> <property name="project" value="bprocessor"/> ! <property name="version" value="M8"/> <property name="script.dir" value="${basedir}/bin"/> |
|
From: Michael L. <he...@us...> - 2006-11-17 15:47:34
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32415/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Fixed a couple of minor problems Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** View.java 16 Nov 2006 23:19:32 -0000 1.162 --- View.java 17 Nov 2006 15:47:33 -0000 1.163 *************** *** 853,856 **** --- 853,865 ---- } } + { + Set holes = new HashSet(); + Iterator iter = surfaces.iterator(); + while (iter.hasNext()) { + Surface current = (Surface) iter.next(); + holes.addAll(current.getHoles()); + } + surfaces.addAll(holes); + } edges.addAll(Surface.edges(surfaces)); } *************** *** 990,996 **** name = sp.getName(); } ! int sepLength = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_10, " >> ");; int length = 0; ! int nameLength = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_10, name); if (selection) { drawClickBox(5 + length, height - 15, 0.5, --- 999,1005 ---- name = sp.getName(); } ! int sepLength = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_12, " >> ");; int length = 0; ! int nameLength = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_12, name); if (selection) { drawClickBox(5 + length, height - 15, 0.5, *************** *** 1006,1010 **** } length += sepLength; ! nameLength = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_10, sp.getName()); if (selection) { drawClickBox(5 + length, height - 15, 0.5, --- 1015,1019 ---- } length += sepLength; ! nameLength = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_12, sp.getName()); if (selection) { drawClickBox(5 + length, height - 15, 0.5, *************** *** 1019,1023 **** gl.glTranslated(5, height - 15, 0.5); gl.glRasterPos2i(0, 0); ! glut.glutBitmapString(gl, GLUT.BITMAP_HELVETICA_10, name); gl.glPopMatrix(); } --- 1028,1032 ---- gl.glTranslated(5, height - 15, 0.5); gl.glRasterPos2i(0, 0); ! glut.glutBitmapString(gl, GLUT.BITMAP_HELVETICA_12, name); gl.glPopMatrix(); } *************** *** 1702,1706 **** gl.glRasterPos2i(0, 0); ! glut.glutBitmapString(gl, GLUT.BITMAP_HELVETICA_18, string); gl.glPopMatrix(); } --- 1711,1715 ---- gl.glRasterPos2i(0, 0); ! glut.glutBitmapString(gl, GLUT.BITMAP_HELVETICA_12, string); gl.glPopMatrix(); } *************** *** 1713,1717 **** */ void drawTextBox(double x, double y, String string) { ! int width = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_18, string); gl.glColor3d(0.85, 0.85, 0.85); gl.glRectd(x - 4, y - 8, x + width + 4, y + 18); --- 1722,1726 ---- */ void drawTextBox(double x, double y, String string) { ! int width = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_12, string); gl.glColor3d(0.85, 0.85, 0.85); gl.glRectd(x - 4, y - 8, x + width + 4, y + 18); *************** *** 1800,1805 **** } ! int frontWidth = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_18, frontName); ! int backWidth = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_18, backName); Vertex frontTextAnchor; --- 1809,1814 ---- } ! int frontWidth = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_12, frontName); ! int backWidth = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_12, backName); Vertex frontTextAnchor; |
|
From: Michael L. <he...@us...> - 2006-11-17 15:47:34
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32415/src/net/sourceforge/bprocessor/gl/tool Modified Files: ToolFactory.java Log Message: Fixed a couple of minor problems Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** ToolFactory.java 14 Nov 2006 15:10:05 -0000 1.66 --- ToolFactory.java 17 Nov 2006 15:47:33 -0000 1.67 *************** *** 15,20 **** import java.net.URL; - import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.awt.Cursor; --- 15,21 ---- import java.net.URL; import java.util.HashMap; + import java.util.LinkedList; + import java.util.List; import java.util.Map; import java.awt.Cursor; *************** *** 224,232 **** public void actionPerformed(ActionEvent agr0) { double aspect = glv.getView().getAspect(); ! Collection c = Selection.primary(); ! if (c.isEmpty()) { ! c.add(Project.getInstance().getActiveSpace()); } - Project.getInstance().getCurrentCamera().zoomOn(Selection.primary(), aspect); this.glv.repaint(); } --- 225,235 ---- public void actionPerformed(ActionEvent agr0) { double aspect = glv.getView().getAspect(); ! if (Selection.primary().isEmpty()) { ! List list = new LinkedList(); ! list.add(Project.getInstance().getActiveSpace()); ! Project.getInstance().getCurrentCamera().zoomOn(list, aspect); ! } else { ! Project.getInstance().getCurrentCamera().zoomOn(Selection.primary(), aspect); } this.glv.repaint(); } |
|
From: Michael L. <he...@us...> - 2006-11-17 15:47:30
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32397/src/net/sourceforge/bprocessor/model Modified Files: Camera.java Space.java Project.java Log Message: Fixed a couple of minor problems Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** Space.java 16 Nov 2006 23:29:10 -0000 1.102 --- Space.java 17 Nov 2006 15:47:28 -0000 1.103 *************** *** 1609,1622 **** switch (level) { case ELEMENT_LEVEL: ! res = "EL" + res; break; case PART_LEVEL: ! res = "PT" + res; break; case SPACE_LEVEL: ! res = "SP" + res; break; case NET_LEVEL: ! res = "NET" + res; break; } --- 1609,1622 ---- switch (level) { case ELEMENT_LEVEL: ! res = "Elm" + res; break; case PART_LEVEL: ! res = "Prt" + res; break; case SPACE_LEVEL: ! res = "Spc" + res; break; case NET_LEVEL: ! res = "Net" + res; break; } Index: Camera.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Camera.java 13 Nov 2006 13:23:33 -0000 1.28 --- Camera.java 17 Nov 2006 15:47:28 -0000 1.29 *************** *** 105,108 **** --- 105,126 ---- } } + + /** + * + * @param other Camera + */ + public void copyfrom(Camera other) { + this.setCenter(new double[]{other.center[0], other.center[1], other.center[2]}); + this.setCamera(new double[]{other.camera[0], other.camera[1], other.camera[2]}); + this.setRoll(new double[]{other.roll[0], other.roll[1], other.roll[2]}); + this.setType(other.getType()); + this.setFocalwidth(other.getFocalwidth()); + Iterator clips = other.getClipplanes().iterator(); + this.clipplanes.clear(); + while (clips.hasNext()) { + ClippingPlane clip = (ClippingPlane)clips.next(); + this.addClipplane(clip); + } + } /** Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** Project.java 17 Nov 2006 15:04:28 -0000 1.93 --- Project.java 17 Nov 2006 15:47:28 -0000 1.94 *************** *** 491,495 **** */ public void setCurrentCamera(Camera camera) { ! currentCamera = camera; changed(this); } --- 491,495 ---- */ public void setCurrentCamera(Camera camera) { ! currentCamera.copyfrom(camera); changed(this); } |
|
From: Michael L. <he...@us...> - 2006-11-17 15:04:30
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14673/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Charset fixed for classicfication files Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** Project.java 16 Nov 2006 23:20:39 -0000 1.92 --- Project.java 17 Nov 2006 15:04:28 -0000 1.93 *************** *** 10,14 **** import java.io.BufferedReader; import java.io.File; ! import java.io.FileReader; import java.util.ArrayList; import java.util.Collection; --- 10,15 ---- import java.io.BufferedReader; import java.io.File; ! import java.io.FileInputStream; ! import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Collection; *************** *** 795,804 **** BufferedReader bf; if (construction) { ! bf = new BufferedReader(new FileReader("classification.csv")); clas = new Classification(0); parent = new Classification(0); last = new Classification(0); } else { ! bf = new BufferedReader(new FileReader("funcClassification.csv")); clas = new Classification(1); parent = new Classification(1); --- 796,807 ---- BufferedReader bf; if (construction) { ! bf = new BufferedReader ! (new InputStreamReader(new FileInputStream("constructions.txt"), "ISO-8859-1")); clas = new Classification(0); parent = new Classification(0); last = new Classification(0); } else { ! bf = new BufferedReader ! (new InputStreamReader(new FileInputStream("functionals.txt"), "ISO-8859-1")); clas = new Classification(1); parent = new Classification(1); |
|
From: Michael L. <he...@us...> - 2006-11-17 15:04:27
|
Update of /cvsroot/bprocessor/build In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14662 Modified Files: build.xml Log Message: Charset fixed for classicfication files Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** build.xml 17 Oct 2006 09:26:07 -0000 1.24 --- build.xml 17 Nov 2006 15:04:23 -0000 1.25 *************** *** 16,20 **** <property name="gl.dir" value="${basedir}/../gl"/> <property name="facade.dir" value="${basedir}/../facade"/> ! <property name="release.dir" value="${basedir}/dist"/> --- 16,20 ---- <property name="gl.dir" value="${basedir}/../gl"/> <property name="facade.dir" value="${basedir}/../facade"/> ! <property name="bproc.dir" value="${basedir}/../bprocessor"/> <property name="release.dir" value="${basedir}/dist"/> *************** *** 44,48 **** <ant dir="${gl.dir}" target="dist"/> <ant dir="${facade.dir}" target="dist"/> ! <copy todir="${release.dir}"> <fileset dir="${script.dir}"> --- 44,52 ---- <ant dir="${gl.dir}" target="dist"/> <ant dir="${facade.dir}" target="dist"/> ! <copy todir="${release.dir}"> ! <fileset dir="${bproc.dir}"> ! <include name="*.txt"/> ! </fileset> ! </copy> <copy todir="${release.dir}"> <fileset dir="${script.dir}"> |
|
From: Michael L. <he...@us...> - 2006-11-17 14:28:14
|
Update of /cvsroot/bprocessor/bprocessor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32072 Added Files: constructions.txt functionals.txt Log Message: new files --- NEW FILE: functionals.txt --- (This appears to be a binary file; contents omitted.) --- NEW FILE: constructions.txt --- (This appears to be a binary file; contents omitted.) |
|
From: Michael L. <he...@us...> - 2006-11-17 14:28:14
|
Update of /cvsroot/bprocessor/bprocessor/.settings In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32072/.settings Added Files: org.eclipse.core.resources.prefs Log Message: new files --- NEW FILE: org.eclipse.core.resources.prefs --- #Fri Nov 17 15:24:21 CET 2006 eclipse.preferences.version=1 encoding/constructions.txt=ISO-8859-1 encoding/functionals.txt=ISO-8859-1 |
|
From: Michael L. <he...@us...> - 2006-11-17 14:28:10
|
Update of /cvsroot/bprocessor/bprocessor/.settings In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31730/.settings Log Message: Directory /cvsroot/bprocessor/bprocessor/.settings added to the repository |
|
From: Nikolaj B. <nbr...@us...> - 2006-11-16 23:29:11
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25178/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: A few bug fixes Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** Space.java 16 Nov 2006 23:20:39 -0000 1.101 --- Space.java 16 Nov 2006 23:29:10 -0000 1.102 *************** *** 266,275 **** } if (this.level == SPACE_LEVEL) { ! cur = new Space("", Space.CONSTRUCTION, ELEMENT_LEVEL, false); cur.setClassification(cl); return cur; } if (this.level == PROJECT_LEVEL) { ! cur = new Space("", Space.CONSTRUCTION, SPACE_LEVEL, false); cur.setClassification(cl); return cur; --- 266,275 ---- } if (this.level == SPACE_LEVEL) { ! cur = new Space("", Space.CONSTRUCTION, ELEMENT_LEVEL, true); cur.setClassification(cl); return cur; } if (this.level == PROJECT_LEVEL) { ! cur = new Space("", Space.CONSTRUCTION, SPACE_LEVEL, true); cur.setClassification(cl); return cur; *************** *** 312,326 **** } if (this.level == ELEMENT_LEVEL) { ! cur = new Space("", Space.FUNCTIONAL , PART_LEVEL, false); cur.setClassification(cl); return cur; } if (this.level == SPACE_LEVEL) { ! cur = new Space("", Space.FUNCTIONAL, ELEMENT_LEVEL, false); cur.setClassification(cl); return cur; } if (this.level == PROJECT_LEVEL) { ! cur = new Space("", Space.FUNCTIONAL, SPACE_LEVEL, false); cur.setClassification(cl); return cur; --- 312,326 ---- } if (this.level == ELEMENT_LEVEL) { ! cur = new Space("", Space.FUNCTIONAL , PART_LEVEL, true); cur.setClassification(cl); return cur; } if (this.level == SPACE_LEVEL) { ! cur = new Space("", Space.FUNCTIONAL, ELEMENT_LEVEL, true); cur.setClassification(cl); return cur; } if (this.level == PROJECT_LEVEL) { ! cur = new Space("", Space.FUNCTIONAL, SPACE_LEVEL, true); cur.setClassification(cl); return cur; *************** *** 1469,1478 **** if (getLevel() == Space.ELEMENT_LEVEL) { setClassification(((Classification)a.getClassification())); - getOwner().setClassification(classification.getParent()); } if (getLevel() == Space.PART_LEVEL) { setClassification(((Classification)a.getClassification())); - getOwner().setClassification(classification.getParent()); - getOwner().getOwner().setClassification(classification.getParent().getParent()); } } else if (a.getName().equals("Transparent")) { --- 1469,1475 ---- |
