sbfc-svn Mailing List for Systems Biology Format Converter (Page 6)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 631
          http://sourceforge.net/p/sbfc/code/631
Author:   niko-rodrigue
Date:     2016-03-09 11:52:19 +0000 (Wed, 09 Mar 2016)
Log Message:
-----------
made the GUI properly resizable 

Modified Paths:
--------------
    trunk/lib/sbfc-1.3.7.jar
    trunk/src/org/sbfc/converter/ConverterGUI.java
    trunk/src/org/sbfc/converter/gui/StatusPanel.java
    trunk/src/org/sbfc/converter/sbml2dot/SBML2Dot.java
    trunk/src/org/sbfc/converter/sbml2sbml/SBML2SBML.java

Modified: trunk/lib/sbfc-1.3.7.jar
===================================================================
(Binary files differ)

Modified: trunk/src/org/sbfc/converter/ConverterGUI.java
===================================================================

--- trunk/src/org/sbfc/converter/ConverterGUI.java	2016-03-08 17:07:11 UTC (rev 630)
+++ trunk/src/org/sbfc/converter/ConverterGUI.java	2016-03-09 11:52:19 UTC (rev 631)
@@ -25,6 +25,7 @@
 
 package org.sbfc.converter;
 
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -77,7 +78,7 @@
   /**
    * 
    */
-  JTextField inputFileTextField = new JTextField(40);
+  JTextField inputFileTextField = new JTextField();
   /**
    * 
    */
@@ -124,21 +125,11 @@
   private void init() {
     setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
     
-    final JPanel jpanel = new JPanel();    
-    setContentPane(jpanel); // add(jpanel);
+    final Container jpanel = getContentPane();        
     jpanel.setLayout(new GridBagLayout());
     
-    // creates a constraints object
-    GridBagConstraints c = new GridBagConstraints();
-    c.insets = new Insets(2, 2, 2, 2); // insets for all components
-    c.gridx = 0; // column 0
-    c.gridy = 0; // row 0
-    c.ipadx = 10; // increases components width by 10 pixels
-    c.ipady = 0; // increases components height by 10 pixels
-    c.anchor = GridBagConstraints.WEST;
-
     JMenuBar menuBar = new JMenuBar();
-    jpanel.add(menuBar, c);
+    setJMenuBar(menuBar);
     
     JMenu filesMenu = new JMenu("Files");
     menuBar.add(filesMenu);
@@ -152,6 +143,14 @@
     });
     filesMenu.add(exitMenuItem);
     
+    JMenuItem aboutMenuItem = new JMenuItem(new AbstractAction("About") {      
+      @Override
+      public void actionPerformed(ActionEvent e) {
+    	  new AboutDialog(application);
+      }
+    });
+    menuBar.add(aboutMenuItem);
+
     inputFileChooser.setCurrentDirectory(new File(System.getProperty("user.home")));
 
     inputFileChooser.setFileFilter(new javax.swing.filechooser.FileFilter() {
@@ -164,20 +163,22 @@
         return "XML files";
       }
     });
+
+    int rowNumber = 0;
     
-    JMenuItem aboutMenuItem = new JMenuItem(new AbstractAction("About") {      
-      @Override
-      public void actionPerformed(ActionEvent e) {
-    	  new AboutDialog(application);
-      }
-    });
-    menuBar.add(aboutMenuItem);
-    
-    c.gridy = 1; // row 0    
+    // creates a constraints object
+    GridBagConstraints c = new GridBagConstraints();
+    c.insets = new Insets(2, 2, 2, 2); // insets for all components
+    c.gridx = 0; // column 0
+    c.gridy = rowNumber; // row 0
+    c.ipadx = 10; // increases components width by 10 pixels
+    c.ipady = 0; // increases components height by 10 pixels
+    c.anchor = GridBagConstraints.WEST;
     jpanel.add(new JLabel("Select input file"), c);
     
     c.gridx = 1; // column 1
     c.ipadx = 300; // increases components width by 300 pixels
+    c.weightx = 0.5;
     c.fill = GridBagConstraints.HORIZONTAL;
     jpanel.add(inputFileTextField, c);
 
@@ -194,15 +195,17 @@
     };
 
     c.fill = GridBagConstraints.NONE;
+    c.weightx = 0;
     c.gridx = 2; // column 2
     c.ipadx = 0; // increases components width by 0 pixels
     inputFileButton = new JButton(inputAction);
     inputFileButton.setToolTipText("Open a file chooser dialog to select the input file");
     jpanel.add(inputFileButton, c);
 
+    rowNumber++;
     
     c.gridx = 0; // column 0
-    c.gridy = 2; // row 1
+    c.gridy = rowNumber;
     c.ipadx = 10; // increases components width by 10 pixels
     c.ipady = 0; // increases components height by 10 pixels    
     
@@ -283,14 +286,16 @@
     });
     jpanel.add(jList, c);
     
-    
+    rowNumber++;
+        
     // Output file row
     c.gridx = 0; // column 0
-    c.gridy = 3; // row 3    
+    c.gridy = rowNumber;    
     jpanel.add(new JLabel("Select output file"), c);
     
     c.gridx = 1; // column 1
     c.ipadx = 300; // increases components width by 300 pixels
+    c.weightx = 0.5;
     c.fill = GridBagConstraints.HORIZONTAL;
     jpanel.add(outputFileTextField, c);
 
@@ -309,13 +314,16 @@
     c.fill = GridBagConstraints.NONE;
     c.gridx = 2; // column 2
     c.ipadx = 0; // increases components width by 0 pixels
+    c.weightx = 0;
     JButton outputFileButton = new JButton(outputAction);
     outputFileButton.setToolTipText("Open a file chooser dialog to select the output file");
     jpanel.add(outputFileButton, c);
 
+    rowNumber++;
+    
     // open output file row
     c.gridx = 0; // column 0
-    c.gridy = 4; // row 4    
+    c.gridy = rowNumber; // row 4    
     jpanel.add(new JLabel("Open output file"), c);
     
     c.gridx = 1; // column 1
@@ -325,9 +333,11 @@
     jpanel.add(openOutputCheckBox, c);
     
     
+    rowNumber++;
+    
     // launch conversion button row.
     c.gridx = 1; // column 1
-    c.gridy = 5; // row 5
+    c.gridy = rowNumber;
     c.insets = new Insets(10, 10, 10, 10); // insets for all components
     c.anchor = GridBagConstraints.CENTER;
     
@@ -386,8 +396,10 @@
     launchButton = new JButton(launchAction);
     jpanel.add(launchButton, c);
     
+    rowNumber++;
+    
     c.gridx = 0; // column 1
-    c.gridy = 6; // row 6
+    c.gridy = rowNumber;
     c.gridwidth = 3;
     c.ipadx = 10; // increases components width by 10 pixels
     c.anchor = GridBagConstraints.WEST;
@@ -461,7 +473,7 @@
     ConverterGUI gui = new ConverterGUI();
     
     gui.setMinimumSize(new Dimension(600, 300));
-    gui.setResizable(false);
+    gui.setResizable(true);
     gui.pack();
     gui.setVisible(true);
     

Modified: trunk/src/org/sbfc/converter/gui/StatusPanel.java
===================================================================
--- trunk/src/org/sbfc/converter/gui/StatusPanel.java	2016-03-08 17:07:11 UTC (rev 630)
+++ trunk/src/org/sbfc/converter/gui/StatusPanel.java	2016-03-09 11:52:19 UTC (rev 631)
@@ -27,6 +27,9 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -46,14 +49,19 @@
 	private static final long serialVersionUID = -1073513153341532991L;
 
 	/** The textLabel. */
-	private JTextField textLabel = new JTextField(85);
+	private JTextField textLabel = new JTextField();
 	
 	/**
 	 * Instantiates a new status panel.
 	 */
 	public StatusPanel() {
-		setLayout(new BorderLayout());
-		add(textLabel,BorderLayout.WEST);
+		setLayout(new GridBagLayout());
+		GridBagConstraints c = new GridBagConstraints();
+		c.anchor = GridBagConstraints.WEST;
+		c.weightx = 0.5;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		
+		add(textLabel, c);
 		setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED));
 		textLabel.setBackground(null);
 		textLabel.setEditable(false);

Modified: trunk/src/org/sbfc/converter/sbml2dot/SBML2Dot.java
===================================================================
--- trunk/src/org/sbfc/converter/sbml2dot/SBML2Dot.java	2016-03-08 17:07:11 UTC (rev 630)
+++ trunk/src/org/sbfc/converter/sbml2dot/SBML2Dot.java	2016-03-09 11:52:19 UTC (rev 631)
@@ -420,6 +420,10 @@
 				String speciesNodeId = species.getId();
 				String speciesShape = converter.getOutputFromClass(species, "unspecified entity");
 
+				if (speciesShape == null) {
+				  speciesShape = "ellipse";
+				}
+				
 				if (speciesShape.equalsIgnoreCase("emptyset")) {
 					speciesNodeId = createEmptySetNode(out, reactionId);
 				} else if (speciesCardinalityMap.get(species) > MAX_EDGE_ALLOWED) {

Modified: trunk/src/org/sbfc/converter/sbml2sbml/SBML2SBML.java
===================================================================
--- trunk/src/org/sbfc/converter/sbml2sbml/SBML2SBML.java	2016-03-08 17:07:11 UTC (rev 630)
+++ trunk/src/org/sbfc/converter/sbml2sbml/SBML2SBML.java	2016-03-09 11:52:19 UTC (rev 631)
@@ -110,6 +110,11 @@
 			String currentSBML;
 			try {
 				currentSBML = sbmlModel.modelToString();
+				
+				if (currentSBML != null && currentSBML.length() > 151) {
+				  System.out.println("SBML2SBML : converted model : \n" + currentSBML.substring(0, 150));
+				}
+				System.out.println();
 			} catch (WriteModelException e1) {
 				e1.printStackTrace();
 				return null;
@@ -203,12 +208,12 @@
 	
 	@Override
 	public String getDescription() {
-		return "It converts an SBML model format to another with different Level/Version";
+		return "Converts an SBML model format to another with different Level/Version";
 	}
 
 	@Override
 	public String getHtmlDescription() {
-		return "It converts an SBML model format to another with different Level/Version";
+		return "Converts an SBML model format to another with different Level/Version";
 	}
 	
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2012	Jan	Feb	Mar	Apr	May	Jun (6)	Jul (5)	Aug (8)	Sep	Oct	Nov (1)	Dec
2013	Jan	Feb	Mar (6)	Apr	May (1)	Jun	Jul	Aug	Sep (3)	Oct	Nov	Dec
2014	Jan (1)	Feb	Mar (4)	Apr	May	Jun (1)	Jul	Aug	Sep (2)	Oct (1)	Nov (4)	Dec
2015	Jan	Feb	Mar (23)	Apr (11)	May (33)	Jun (13)	Jul (86)	Aug (46)	Sep (104)	Oct (9)	Nov (1)	Dec
2016	Jan (9)	Feb (19)	Mar (8)	Apr	May (4)	Jun (25)	Jul (24)	Aug (14)	Sep	Oct (2)	Nov	Dec
2017	Jan (3)	Feb	Mar	Apr	May	Jun	Jul	Aug (2)	Sep (1)	Oct	Nov (1)	Dec
2018	Jan (1)	Feb	Mar (6)	Apr (7)	May (8)	Jun (5)	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar (8)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2021	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2022	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (9)	Oct	Nov	Dec
2023	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (3)	Dec

sbfc-svn Mailing List for Systems Biology Format Converter (Page 6)

sbfc-svn — SVN commit notification list for the SBFC project.