Skip to content

Commit

Permalink
Release 2.6.0
Browse files Browse the repository at this point in the history
Merge from branch '2.5.x'
  • Loading branch information
goglepox committed Jan 29, 2013
2 parents aa7ba7f + 782356f commit fa8dd6a
Show file tree
Hide file tree
Showing 19 changed files with 169 additions and 22 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,2 +1,3 @@
.settings
bin
.DS_Store
2 changes: 1 addition & 1 deletion features/net.bioclipse.blueobelisk_feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="net.bioclipse.blueobelisk_feature"
label="Blue Obelisk Data Repository Feature"
version="2.1.0"
version="2.6.0.vqualifier"
provider-name="The Bioclipse Team"
plugin="net.bioclipse.data.blueobelisk">

Expand Down
2 changes: 1 addition & 1 deletion features/net.bioclipse.data_site/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="net.bioclipse.data_site"
label="Additional Data Sets Update Site"
version="2.4.1"
version="2.6.0.qualifier"
provider-name="The Bioclipse Team">

<description url="http://www.example.com/description">
Expand Down
15 changes: 6 additions & 9 deletions features/net.bioclipse.drugbank_feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="net.bioclipse.drugbank_feature"
label="DrugBank Feature"
version="2.5"
version="2.6.0.vqualifier"
provider-name="The Bioclipse Team"
plugin="net.bioclipse.data.drugbank">

Expand All @@ -15,22 +15,19 @@
</copyright>

<license url="http://www.drugbank.ca/">
&lt;p&gt;
DrugBank is offered to the public as a freely available resource.
Use and re-distribution of the data, in whole or in part, for
commercial purposes requires explicit permission of the authors
and explicit acknowledgment of the source material (DrugBank)
and the
original publication (see below). We ask that users who download
significant portions of the database cite the DrugBank paper
in any
resulting publications.
and the original publication (see below). We ask that users who
download significant portions of the database cite the DrugBank
paper in any resulting publications.


&lt;p&gt;
Wishart DS et al., DrugBank: a comprehensive resource for in
silico drug discovery and exploration. Nucleic Acids Res. 2006
Jan
1;34(Database issue):D668-672, doi: &lt;a href=&quot;http://dx.doi.org/10.1093/nar/gkj067&quot;&gt;10.1093/nar/gkj067&lt;/a&gt;.
1;34(Database issue):D668-672, doi: 10.1093/nar/gkj067 (http://dx.doi.org/10.1093/nar/gkj067).
</license>

<url>
Expand Down
2 changes: 1 addition & 1 deletion features/net.bioclipse.sampledata_feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="net.bioclipse.sampledata_feature"
label="Sample Data Feature"
version="2.4.0.20100709"
version="2.6.0.vqualifier"
provider-name="The Bioclipse Team"
plugin="net.bioclipse.data.sampledata">

Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Blue Obelisk Chemical Structures Repository
Bundle-SymbolicName: net.bioclipse.data.blueobelisk;singleton:=true
Bundle-Version: 2.1.0
Bundle-Version: 2.6.0.vqualifier
Bundle-Activator: net.bioclipse.data.blueobelisk.Activator
Bundle-Vendor: The Bioclipse Team
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion plugins/net.bioclipse.data.drugbank/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: DrugBank Database
Bundle-SymbolicName: net.bioclipse.data.drugbank;singleton:=true
Bundle-Version: 2.5
Bundle-Version: 2.6.0.vqualifier
Bundle-Activator: net.bioclipse.data.drugbank.Activator
Bundle-Vendor: The Bioclipse Team
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion plugins/net.bioclipse.data.sampledata/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Bioclipse Sample Data
Bundle-SymbolicName: net.bioclipse.data.sampledata;singleton:=true
Bundle-Version: 2.4.0.20100709
Bundle-Version: 2.6.0.vqualifier
Bundle-Activator: net.bioclipse.data.sampledata.Activator
Bundle-Vendor: The Bioclipse Team
Require-Bundle: org.eclipse.ui,
Expand Down
30 changes: 30 additions & 0 deletions plugins/net.bioclipse.data.sampledata/data/Javascripts/buildmol.js
@@ -0,0 +1,30 @@
/*******************************************************************************
* Bioclipse-script to iteratively build a molecule in JChemPaint
* Author: Ola Spjuth
* Author: Egon Willighagen
******************************************************************************/

//Start with a carbon and open in JCP
mol=cdk.fromSMILES("C")
mol2=cdk.generate2dCoordinates(mol)
ui.open(mol2)

//Add some atoms and bonds and wait 1 sec in between
atom=jcp.getModel().getAtomContainer().getAtom(0);
atom=jcp.addAtom("C", atom)
js.delay(1)
atom=jcp.addAtom("C", atom)
js.delay(1)
atom=jcp.addAtom("C", atom)
js.delay(1)
atom=jcp.addAtom("C", atom)
js.delay(1)
jcp.addPhenyl(atom)
js.delay(1)
molecule=jcp.getModel().getAtomContainer()
atom=molecule.getAtom(molecule.getAtomCount()-1);
atom=jcp.addAtom("C", atom)
js.delay(1)
atom=jcp.addAtom("C", atom)
js.delay(1)
jcp.addRing(atom,5)
@@ -0,0 +1,8 @@
//Download PDB
mol=ws.queryPDB("1d66")
ui.open(mol.get(0))

//Do some jmol visualization
jmol.run("move 0 0 90 00 0 0 0 0 1;set selectionhalos off; select all; spacefill 0; cartoon on;")
jmol.run("select nucleic; isosurface dna1 solvent; delay 1; color isosurface red;");
jmol.run("delay 1; color isosurface blue; delay 1; color isosurface translucent; move 0 360 90 90 0 0 0 0 4;");
@@ -0,0 +1,8 @@
//Download PDB via Web service at EBI and open in Jmol
mol=ws.queryPDB("1d66")
ui.open(mol.get(0))

//Execute some jmol script commands
jmol.run("select all; spacefill 0; wireframe off; cartoon on;select none")
jmol.run("select !dna; isosurface solvent; select none; color isosurface blue")
jmol.spinOn()
@@ -1,4 +1,5 @@
//Output SMILES for all molecules in an SDFile
var mols = cdk.loadMolecules("/Sample Data/SDF/Fragments2.sdf");
for (var i = 0; i < mols.size(); i++) {
print(cdk.calculateSMILES(mols.get(i)) + "\n");
js.print(cdk.calculateSMILES(mols.get(i)) + "\n");
}
@@ -1,10 +1,11 @@
//Output SMILES and MASS for all molecules in an SDFile
var mols = cdk.loadMolecules("/Sample Data/SDF/Fragments2.sdf");

for (var i = 0; i < mols.size(); i++) {
var mol = mols.get(i);

print(cdk.calculateMass(mol) +
"\t" +
cdk.calculateSMILES(mol) +
js.print( cdk.calculateSMILES(mol) +
": \t" +
cdk.calculateMass(mol) +
"\n" );
}
@@ -0,0 +1,40 @@
/*******************************************************************************
* Bioclipse-script to generate different coordinates on a list of molecules.
* Author: Ola Spjuth
******************************************************************************/

//Create list of molecules
mols=cdk.createMoleculeList();
mols.add(cdk.fromSMILES("CCC"));
mols.add(cdk.fromSMILES("CCCNCC"));
mols.add(cdk.fromSMILES("CCNCCOC(C)CC"));

//Print out molecules with no coordinates
js.print("\n\nWe have " + mols.size() + " mols in list: mols\n");
for (i=0; i<mols.size();i++){
js.print( i +" has 2D: " + cdk.has2d(mols.get(i)) + " , has 3D:" + cdk.has3d(mols.get(i)) +" \n");
}

//Generate 2D coordinates from no coordinates
mols2=cdk.generate2dCoordinates(mols);
js.print("\nWe have " + mols2.size() + " mols in list: mols2\n");
for (i=0; i<mols2.size();i++){
js.print( i +" has 2D: " + cdk.has2d(mols2.get(i)) + " , has 3D:" + cdk.has3d(mols2.get(i)) +" \n");
}

//Generate 3D coordinates from no coordinates
mols3=cdk.generate3dCoordinates(mols);
js.print("\nWe have " + mols3.size() + " mols in list: mols3\n");
for (i=0; i<mols3.size();i++){
js.print( i +" has 2D: " + cdk.has2d(mols3.get(i)) + " , has 3D:" + cdk.has3d(mols3.get(i)) +" \n");
}

//Generate 3D coordinates from 2D coordinates
mols4=cdk.generate3dCoordinates(mols2);
js.print("\nWe have " + mols4.size() + " mols in list: mols4\n");
for (i=0; i<mols4.size();i++){
js.print( i +" has 2D: " + cdk.has2d(mols4.get(i)) + " , has 3D:" + cdk.has3d(mols4.get(i)) +" \n");
}

//Test open MolTable on Molecules with 5D
ui.open(mols);
@@ -0,0 +1,5 @@
//Create a molecule from SMILES, open in JCP and customize rendering
mol=cdk.fromSMILES("C1CCCCC1CC(CCO)CCNC")
mol2=cdk.generate2dCoordinates(mol)
ui.open(mol2)
jcpglobal.setShowAromaticity(true)
@@ -0,0 +1,19 @@
//Generate molecule from SMILES and generate 3D coordinates with CDK
mol = cdk.fromSMILES("C(C1C(C(C(C(O1)O)O)O)O)O");
mol = cdk.addExplicitHydrogens(mol);
cdk.generate3dCoordinates(mol);

//Save to file in CML
fileName = "/Virtual/" + cdk.molecularFormula(mol) + ".cml";
if ( ui.fileExists(fileName) ) {
ui.remove(fileName);
}
cdk.saveCML(mol, fileName);

//Open file and do some Jmol scripting
ui.open(fileName);
jmol.run("background black");
jmol.run("set echo botom left; echo Mass: " + cdk.calculateMass(mol))
jmol.run("select all; dots on; select none");
jmol.minimize();
jmol.run("move 60 360 30 -45 0 0 0 0 7");
@@ -0,0 +1,7 @@
//Demonstrates basic manipulation of multiple molecules in Bioclipse
//Requires sample data installed in default location
mols=cdk.loadMolecules("/Sample Data/SDF/Fragments2.sdf")
mols.size()
mol=mols.get(3)
cdk.calculateSMILES(mols.get(4))
ui.open(mols)
30 changes: 30 additions & 0 deletions plugins/net.bioclipse.data.sampledata/data/SMILES/sample30.smi
@@ -0,0 +1,30 @@
C(=O)N(Cc1ccco1)C(c1cc2ccccc2cc1)C(=O)NCc1ccccc1 1
C(=O)(C=CC)N(CCCCCCC)C(c1cc2c(cccc2)c2ccccc12)C(=O)NC(C)(C)C 2
C(=O)(CNC(=O)OC(C)(C)C)N(Cc1oc(C(F)(F)F)cc1)C(c1ccccc1)C(=O)NCc1ccccc1 3
C(=O)(CNC(=O)OC(C)(C)C)N(Cc1ccco1)C(c1ccccc1)C(=O)NCc1ccccc1 4
C(=O)(CNC(=O)OC(C)(C)C)N(Cc1ccc(o1)C)C(c1ccc(OC)c(c1)OC)C(=O)NCc1ccccc1 5
C(=O)(C=CC)N(Cc1ccccc1)C(c1cc2c(cccc2)c2ccccc12)C(=O)NC(C)(C)C 6
C(=O)(CNC(=O)OC(C)(C)C)N(Cc1ccc(o1)C)C(c1ccccc1)C(=O)NC(C)(C)C 7
C(=O)(CNC(=O)OC(C)(C)C)N(Cc1ccco1)C(c1ccccc1)C(=O)NC(C)(C)C 8
C(=O)(CNC(=O)OC(C)(C)C)N(Cc1ccc(o1)C)C(c1ccc2OCOc2c1)C(=O)NC(C)(C)C 9
C(=O)(CNC(=O)OC(C)(C)C)N(Cc1ccco1)C(c1ccc(OC)c(c1)OC)C(=O)NC(C)(C)C 10
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCCCCCC)C(c1cccc(c1O)OC)C(=O)NCc1ccccc1 11
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCCCCCCC)C(c1cccc(c1O)OC)C(=O)NCc1ccccc1 12
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCCCCCC)C(c1cccc(c1O)OC)C(=O)NCCCC 13
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCCCCC)C(c1cccc(c1O)OC)C(=O)NCCCC 14
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCCCCCCC)C(c1cccc(c1O)OC)C(=O)NCCCC 15
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCC)C(c1cccc(c1O)OC)C(=O)NCCCC 16
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(Cc1ccco1)C(c1ccc(OC)c(c1)OC)C(=O)NCCCC 17
C(=O)N(Cc1ccco1)C(c1cc2ccccc2cc1)C(=O)NCCCC 18
C(=O)N(Cc1ccc(o1)C)C(c1cc2ccccc2cc1)C(=O)NCCCC 19
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCCCCCC)C(c1cccc(c1O)OC)C(=O)NCCCCC 20
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCCCCC)C(c1cccc(c1O)OC)C(=O)NCCCCC 21
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCCCCCCC)C(c1cccc(c1O)OC)C(=O)NCCCCC 22
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(CCC)C(c1cccc(c1O)OC)C(=O)NCCCCC 23
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(Cc1ccc(o1)C)C(c1ccc(OC)c(c1)OC)C(=O)NCCCCC 24
C(=O)(C(NC(=O)OC(C)(C)C)CC1c2ccccc2NC1)N(Cc1ccco1)C(c1ccc(OC)c(c1)OC)C(=O)NCCCCC 25
C(=O)N(CCCCCC)C(c1cc2ccccc2cc1)C(=O)NCCCCC 26
C(=O)(CCCc1ccc2ccc3cccc4ccc1c2c34)N(C)C(c1cc2ccccc2cc1)C(=O)NC(C)(C)C 27
C(=O)(c1cccc(O)c1O)N(C)C(c1ccc(c2ccc(OC)cc12)OC)C(=O)NCS(=O)(=O)c1ccc(cc1)C 28
C(=O)(c1c(cc(O)cc1O)O)N(C)C(c1ccc(O)c(c1)O)C(=O)NCS(=O)(=O)c1ccc(cc1)C 29
C(=O)N(Cc1ccc(o1)C)C(c1ccccc1)C(=O)NCS(=O)(=O)c1ccc(cc1)C 30
6 changes: 3 additions & 3 deletions plugins/net.bioclipse.data.sampledata/plugin.xml
Expand Up @@ -10,7 +10,7 @@
location="data/2DStructures"
/>
<folder
name="3D Structures"
name="3D structures"
description="Sample structures with 3D coordinates"
location="data/3DStructures"
/>
Expand All @@ -20,8 +20,8 @@
location="data/AminoAcids"
/>
<folder
name="Javascripts"
description="Sample scripts in Javascript"
name="JavaScript scripts"
description="Sample scripts in JavaScript"
location="data/Javascripts"
/>
<folder
Expand Down

0 comments on commit fa8dd6a

Please sign in to comment.