Hello!

To see the file structure, click on "tree".

Note that updates take place every 10 minutes, commits may not be seen immediately.
old-jaiswallab-svn/.git
12 years agoTwo tickets in progress: Trac #149, 188.
preecej [Tue, 18 Sep 2012 17:14:51 +0000 (17:14 +0000)]
Two tickets in progress: Trac #149, 188.

Save and Close not done yet.

Object clearing associated with file-switching is improved, but not complete.

svn path=/; revision=378

12 years agoTest commit
ahmedi [Mon, 27 Aug 2012 19:24:59 +0000 (19:24 +0000)]
Test commit

svn path=/; revision=377

12 years agoFinal modifications. Working download link and image generation. Notes
miles [Wed, 15 Aug 2012 19:09:12 +0000 (19:09 +0000)]
Final modifications. Working download link and image generation. Notes
for future: Downloadable image doesn't have special grey and gold
squares representing 0 and 1 genes, respectively. Possibility of
modification later. If the visual effects of the scroll bars on
heatMap.php page becomes an issue, consider surrounding current div tag
with an additional div tag in order to simulate scrolling.

svn path=/; revision=376

12 years agoAdd back code to use the heatchart.java method
elserj [Wed, 15 Aug 2012 17:40:48 +0000 (17:40 +0000)]
Add back code to use the heatchart.java method

svn path=/; revision=375

12 years agoChanged Kevin McGuinness' affiliation and added a link to the orig software download
preecej [Mon, 13 Aug 2012 22:32:23 +0000 (22:32 +0000)]
Changed Kevin McGuinness' affiliation and added a link to the orig software download

svn path=/; revision=374

12 years agoDeleted unneeded files
miles [Mon, 13 Aug 2012 20:07:50 +0000 (20:07 +0000)]
Deleted unneeded files

svn path=/; revision=373

12 years agoAdded Web page files
miles [Mon, 13 Aug 2012 20:06:37 +0000 (20:06 +0000)]
Added Web page files

svn path=/; revision=372

12 years agoUpdates for web page compatibility.
miles [Thu, 9 Aug 2012 21:44:35 +0000 (21:44 +0000)]
Updates for web page compatibility.

svn path=/; revision=371

12 years agoAdded webpage stuff.
miles [Wed, 25 Jul 2012 20:48:54 +0000 (20:48 +0000)]
Added webpage stuff.

svn path=/; revision=370

12 years agoAdded HeatChart.java and modified it from original jar file to print the species...
elserj [Wed, 25 Jul 2012 20:35:38 +0000 (20:35 +0000)]
Added HeatChart.java and modified it from original jar file to print the species on top.  Also added some color and other options to the heatchart drawing.

svn path=/; revision=369

12 years agoFully operational image generation, independent of JHeatChart libraries.
miles [Mon, 23 Jul 2012 22:53:04 +0000 (22:53 +0000)]
Fully operational image generation, independent of JHeatChart libraries.

svn path=/; revision=368

12 years agoWorking copy with JHeatChart.java. Puts the species axis at the bottom of the graph...
miles [Mon, 23 Jul 2012 22:16:47 +0000 (22:16 +0000)]
Working copy with JHeatChart.java. Puts the species axis at the bottom of the graph rather than the top.

svn path=/; revision=367

12 years agoFixed empty args error. Also added code to print actual SQL error messages
elserj [Fri, 20 Jul 2012 23:37:26 +0000 (23:37 +0000)]
Fixed empty args error.  Also added code to print actual SQL error messages

svn path=/; revision=366

12 years agoTab Delimited File option fully functional. See tmp.txt for an example output file.
miles [Thu, 19 Jul 2012 21:02:54 +0000 (21:02 +0000)]
Tab Delimited File option fully functional. See tmp.txt for an example output file.

svn path=/; revision=365

12 years agoAdded TO (Trait Ontology) web service and db access, fixed Annotation
preecej [Wed, 18 Jul 2012 02:52:09 +0000 (02:52 +0000)]
Added TO (Trait Ontology) web service and db access, fixed Annotation
form bug on listing Publications (no more tilde wildcards.)

svn path=/; revision=364

12 years agoNow able to handle more than one gene at a time.
miles [Tue, 17 Jul 2012 18:38:39 +0000 (18:38 +0000)]
Now able to handle more than one gene at a time.

svn path=/; revision=363

12 years agoSpecies now unique and alphabetized, geneMaps properly constructed, no errors.
miles [Tue, 17 Jul 2012 18:11:08 +0000 (18:11 +0000)]
Species now unique and alphabetized, geneMaps properly constructed, no errors.

svn path=/; revision=362

12 years agoTrying to move most of workload from java to sql. Hoping to also overcome issues...
miles [Tue, 17 Jul 2012 17:15:11 +0000 (17:15 +0000)]
Trying to move most of workload from java to sql. Hoping to also overcome issues with repeat species in the final list and parsing of data into heatmap format.

svn path=/; revision=361

12 years agoInitial import.
miles [Mon, 16 Jul 2012 22:14:15 +0000 (22:14 +0000)]
Initial import.

svn path=/; revision=360

12 years agoFixed curr_ontology_type bug in transform_gaf, correctly switches
preecej [Sat, 14 Jul 2012 00:33:57 +0000 (00:33 +0000)]
Fixed curr_ontology_type bug in transform_gaf, correctly switches
between ontologies in the same file during XML generation

svn path=/; revision=359

12 years agoAdded "Assigned By" field
preecej [Fri, 13 Jul 2012 17:46:16 +0000 (17:46 +0000)]
Added "Assigned By" field

svn path=/; revision=358

12 years agoCan now handle "Assigned By" (GAF column 15); fixed a couple of bugs;
preecej [Fri, 13 Jul 2012 17:25:58 +0000 (17:25 +0000)]
Can now handle "Assigned By" (GAF column 15); fixed a couple of bugs;
added "Vitis vinifera" species handling

svn path=/; revision=357

12 years agoinitializing miles van de wetering's file
miles [Mon, 9 Jul 2012 21:13:49 +0000 (21:13 +0000)]
initializing miles van de wetering's file

svn path=/; revision=356

12 years agoUpdated to work for Vitis vinifera (grape) imports. Also handled some
preecej [Sat, 7 Jul 2012 01:33:59 +0000 (01:33 +0000)]
Updated to work for Vitis vinifera (grape) imports. Also handled some
"missing data" scenarios for the Gene Name and Evidence fields.

svn path=/; revision=355

12 years agomodified to match non-Mac updates to config files
preecej [Fri, 6 Jul 2012 03:24:01 +0000 (03:24 +0000)]
modified to match non-Mac updates to config files

svn path=/; revision=354

12 years agoTrac #157: closed
preecej [Fri, 6 Jul 2012 00:22:37 +0000 (00:22 +0000)]
Trac #157: closed
#149: still working on recalculating window size and placement for a new image, maybe also need to dispose annotations and segments from previous image.

svn path=/; revision=353

12 years ago[Trac tickets]
preecej [Wed, 4 Jul 2012 22:29:31 +0000 (22:29 +0000)]
[Trac tickets]
Closed: 204,200,203,202,198
Held: 193,188,186
Working on Trac tickets: 149,157

svn path=/; revision=352

12 years agoMemory disposal work (when opening a new file) in progress.
preecej [Wed, 4 Jul 2012 01:56:30 +0000 (01:56 +0000)]
Memory disposal work (when opening a new file) in progress.

svn path=/; revision=351

12 years agoChanged app name to SIA where necessary, re-added Exit menu option (under File),...
preecej [Wed, 27 Jun 2012 20:33:34 +0000 (20:33 +0000)]
Changed app name to SIA where necessary, re-added Exit menu option (under File), removed Tools menu dropdown

svn path=/; revision=350

13 years agoremove annotated_keyword_listid column
athreyab [Tue, 12 Jun 2012 20:09:20 +0000 (20:09 +0000)]
remove annotated_keyword_listid column

svn path=/; revision=349

13 years agointeraction db stuff
athreyab [Mon, 11 Jun 2012 20:13:30 +0000 (20:13 +0000)]
interaction db stuff

svn path=/; revision=348

13 years agorenaming image_annotation to image_annotation_db
athreyab [Mon, 11 Jun 2012 20:02:28 +0000 (20:02 +0000)]
renaming image_annotation to image_annotation_db

svn path=/; revision=347

13 years agoimage annotation database stuff
athreyab [Mon, 11 Jun 2012 20:01:00 +0000 (20:01 +0000)]
image annotation database stuff

svn path=/; revision=346

13 years agosew together SSR data from 3 different sample transcriptome assemblies
preecej [Thu, 7 Jun 2012 22:05:21 +0000 (22:05 +0000)]
sew together SSR data from 3 different sample transcriptome assemblies
, correlate via BLAST, output SSR count differentials amongst resulting orthologs >
dimer

svn path=/; revision=345

13 years agosvn path=/; revision=344
preecej [Wed, 6 Jun 2012 22:57:35 +0000 (22:57 +0000)]
svn path=/; revision=344

13 years agodocumentation
athreyab [Tue, 5 Jun 2012 23:35:32 +0000 (23:35 +0000)]
documentation

svn path=/; revision=343

13 years agoCoordinates saving functionality and some UI alignments. Done by Nikhil.
lingutln [Tue, 5 Jun 2012 20:53:56 +0000 (20:53 +0000)]
Coordinates saving functionality and some UI alignments. Done by Nikhil.

svn path=/; revision=342

13 years agoSaving annotated images functionality and UI changes. Done by Nikhil.
lingutln [Thu, 31 May 2012 20:45:20 +0000 (20:45 +0000)]
Saving annotated images functionality and UI changes. Done by Nikhil.

svn path=/; revision=341

13 years agoData storage functionality completed. Done by Nikhil.
lingutln [Thu, 31 May 2012 19:34:56 +0000 (19:34 +0000)]
Data storage functionality completed. Done by Nikhil.

svn path=/; revision=340

13 years agoAdded parameters to the term search web service call for prioritizing exact match...
preecej [Thu, 31 May 2012 19:12:13 +0000 (19:12 +0000)]
Added parameters to the term search web service call for prioritizing exact match and grouping branches

svn path=/; revision=339

13 years agoterm detail web service fix, and some temp URL testing of the next web service version
preecej [Sat, 26 May 2012 01:38:17 +0000 (01:38 +0000)]
term detail web service fix, and some temp URL testing of the next web service version

svn path=/; revision=338

13 years agoMoved term detail synonyms to separate table; more debugging to to, alon with bolding...
preecej [Sat, 26 May 2012 00:09:53 +0000 (00:09 +0000)]
Moved term detail synonyms to separate table; more debugging to to, alon with bolding the selected synonym

svn path=/; revision=337

13 years agoData retrieval functionality completed and using ontologyterm object everywhere....
lingutln [Thu, 24 May 2012 20:56:07 +0000 (20:56 +0000)]
Data retrieval functionality completed and using ontologyterm object everywhere. Done by Nikhil.

svn path=/; revision=336

13 years agoUI and term search web service adjustments
preecej [Wed, 23 May 2012 23:00:53 +0000 (23:00 +0000)]
UI and term search web service adjustments

svn path=/; revision=335

13 years agoSimple gene and expression data mapping scripts for the Rice Seed Dev
preecej [Wed, 23 May 2012 20:43:06 +0000 (20:43 +0000)]
Simple gene and expression data mapping scripts for the Rice Seed Dev
project

svn path=/; revision=334

13 years agoModified some UI functionalities and Species terms bug. Done by Nikhil.
lingutln [Tue, 22 May 2012 23:41:52 +0000 (23:41 +0000)]
Modified some UI functionalities and Species terms bug. Done by Nikhil.

svn path=/; revision=333

13 years agoData retrieval(Fully done). Data storage(except saving boundary coordinates). Done...
lingutln [Mon, 21 May 2012 22:32:44 +0000 (22:32 +0000)]
Data retrieval(Fully done). Data storage(except saving boundary coordinates). Done by Nikhil.

svn path=/; revision=332

13 years agoremove first \1
athreyab [Sat, 19 May 2012 17:23:55 +0000 (17:23 +0000)]
remove first \1

svn path=/; revision=331

13 years agoPO web service term detail call complete; still needs UI refinement (i.e. nested...
preecej [Wed, 16 May 2012 22:45:21 +0000 (22:45 +0000)]
PO web service term detail call complete; still needs UI refinement (i.e. nested list for synonyms with annotated synonym highlighted, proper horiz and vert expansion of composite) but the basics are there

svn path=/; revision=330

13 years agoin progress: ontologyTerm refactoring associated with term detail web service call
preecej [Tue, 15 May 2012 23:58:32 +0000 (23:58 +0000)]
in progress: ontologyTerm refactoring associated with term detail web service call

svn path=/; revision=329

13 years agoin progress: term details web service call
preecej [Tue, 15 May 2012 21:36:26 +0000 (21:36 +0000)]
in progress: term details web service call

svn path=/; revision=328

13 years agopair/singleton script update
athreyab [Tue, 1 May 2012 02:36:13 +0000 (02:36 +0000)]
pair/singleton script update

svn path=/; revision=327

13 years agobash script for creating singleton/pair
athreyab [Tue, 1 May 2012 00:20:22 +0000 (00:20 +0000)]
bash script for creating singleton/pair

svn path=/; revision=326

13 years agoillumina parse scripts
athreyab [Mon, 16 Apr 2012 20:47:29 +0000 (20:47 +0000)]
illumina parse scripts

svn path=/; revision=325

13 years agoChanged PO web service term_search URL: removed branch filter
preecej [Thu, 12 Apr 2012 19:13:58 +0000 (19:13 +0000)]
Changed PO web service term_search URL: removed branch filter

svn path=/; revision=324

13 years agoMoved permanently to /plantontology repo (/html/services/)
preecej [Wed, 11 Apr 2012 23:42:19 +0000 (23:42 +0000)]
Moved permanently to /plantontology repo (/html/services/)

svn path=/; revision=323

13 years agochanged PO aspect (branch) reference to
preecej [Wed, 11 Apr 2012 23:09:50 +0000 (23:09 +0000)]
changed PO aspect (branch) reference to
"plant_structure_development_stage"

svn path=/; revision=322

13 years agoMade this service environment-independent. Now refers to db connection
preecej [Wed, 11 Apr 2012 22:59:50 +0000 (22:59 +0000)]
Made this service environment-independent. Now refers to db connection
string values with generic names.

svn path=/; revision=321

13 years agoUpdated "plant growth and development stage" to "plant structure
preecej [Wed, 11 Apr 2012 20:41:51 +0000 (20:41 +0000)]
Updated "plant growth and development stage" to "plant structure
development stage"

svn path=/; revision=320

13 years agoResolved refactoring of segment label. Done by Nikhil.
lingutln [Tue, 10 Apr 2012 20:49:54 +0000 (20:49 +0000)]
Resolved refactoring of segment label. Done by Nikhil.

svn path=/; revision=319

13 years agosvn path=/; revision=318
lingutln [Mon, 9 Apr 2012 23:21:19 +0000 (23:21 +0000)]
svn path=/; revision=318

13 years agoBase64 Decoding for UBio webservice. Done by Nikhil.
lingutln [Mon, 9 Apr 2012 23:05:07 +0000 (23:05 +0000)]
Base64 Decoding for UBio webservice. Done by Nikhil.

svn path=/; revision=317

13 years agoImplemented Ubio Web service integration.(yet to complete reloading functionality...
lingutln [Mon, 9 Apr 2012 21:05:21 +0000 (21:05 +0000)]
Implemented Ubio Web service integration.(yet to complete reloading functionality) Done by Nikhil.

svn path=/; revision=316

13 years agoAdding an html_mocks folder for design mocks, first set of content for
preecej [Wed, 4 Apr 2012 23:53:59 +0000 (23:53 +0000)]
Adding an html_mocks folder for design mocks, first set of content for
PO Image Annotation popup

svn path=/; revision=315

13 years agoFix broken relative link with absolute link. Relative would be better but because...
elserj [Wed, 14 Mar 2012 22:20:44 +0000 (22:20 +0000)]
Fix broken relative link with absolute link.  Relative would be better but because of the structure of drupal, absolute is required

svn path=/; revision=314

13 years agoLimited "Recent blog posts" retrieval to 5 lines.
preecej [Tue, 13 Mar 2012 20:39:00 +0000 (20:39 +0000)]
Limited "Recent blog posts" retrieval to 5 lines.

svn path=/; revision=313

13 years agoNew directory used to hold small changes to Drupal basecode. If large
preecej [Tue, 13 Mar 2012 20:38:07 +0000 (20:38 +0000)]
New directory used to hold small changes to Drupal basecode. If large
changes start to pile up, consider moving to a complete SVN repo of our
Drupal install.

svn path=/; revision=312

13 years agoadded bullets to right nav blog posts (class item-list)
preecej [Mon, 12 Mar 2012 23:21:01 +0000 (23:21 +0000)]
added bullets to right nav blog posts (class item-list)

svn path=/; revision=311

13 years agoLatest Commits. Done by Nikhil.
lingutln [Mon, 12 Mar 2012 18:56:49 +0000 (18:56 +0000)]
Latest Commits. Done by Nikhil.

svn path=/; revision=310

13 years agostylesheet adjustment for transparent banner background
preecej [Wed, 7 Mar 2012 22:02:01 +0000 (22:02 +0000)]
stylesheet adjustment for transparent banner background

svn path=/; revision=309

13 years agomade banner background match general background; should move to new style in CSS
preecej [Wed, 7 Mar 2012 21:30:05 +0000 (21:30 +0000)]
made banner background match general background; should move to new style in CSS

svn path=/; revision=308

13 years agoModified DRUPAL HEADER to use Jaiswal Lab logo if no $site_name is provided; need...
preecej [Wed, 7 Mar 2012 21:15:03 +0000 (21:15 +0000)]
Modified DRUPAL HEADER to use Jaiswal Lab logo if no $site_name is provided; need to eventually make this a configurable setting via osu_confident.info

svn path=/; revision=307

13 years agoSaving as a zip file functionality. Done by Nikhil.
lingutln [Mon, 5 Mar 2012 21:08:08 +0000 (21:08 +0000)]
Saving as a zip file functionality. Done by Nikhil.

svn path=/; revision=306

13 years agoSaving as a zip functionality. Done by Nikhil.
lingutln [Mon, 5 Mar 2012 18:55:24 +0000 (18:55 +0000)]
Saving as a zip functionality. Done by Nikhil.

svn path=/; revision=305

13 years agoSaving imagemap as a zip file functionality. Done by Nikhil.
lingutln [Thu, 1 Mar 2012 00:23:54 +0000 (00:23 +0000)]
Saving imagemap as a zip file functionality. Done by Nikhil.

svn path=/; revision=304

13 years agocommitting missed files and minor changes to the sif script
athreyab [Tue, 28 Feb 2012 22:44:18 +0000 (22:44 +0000)]
committing missed files and minor changes to the sif script

svn path=/; revision=303

13 years agomodifications to add date and column type changes
athreyab [Tue, 28 Feb 2012 19:13:12 +0000 (19:13 +0000)]
modifications to add date and column type changes

svn path=/; revision=302

13 years agoMinor alignments in Linux and Windows OS. Done by Nikhil.
lingutln [Mon, 20 Feb 2012 20:05:09 +0000 (20:05 +0000)]
Minor alignments in Linux and Windows OS. Done by Nikhil.

svn path=/; revision=301

13 years agoMinor alignments in Windows machine. Done by Nikhil.
lingutln [Sun, 19 Feb 2012 01:19:09 +0000 (01:19 +0000)]
Minor alignments in Windows machine. Done by Nikhil.

svn path=/; revision=300

13 years agoLatest Changes. Done by Nikhil.
lingutln [Sat, 18 Feb 2012 22:49:37 +0000 (22:49 +0000)]
Latest Changes. Done by Nikhil.

svn path=/; revision=299

13 years agoSaving metadata to HTML imagemap. Done by Nikhil.
lingutln [Fri, 10 Feb 2012 21:54:14 +0000 (21:54 +0000)]
Saving metadata to HTML imagemap. Done by Nikhil.

svn path=/; revision=298

13 years agosvn path=/; revision=297
lingutln [Fri, 10 Feb 2012 02:46:16 +0000 (02:46 +0000)]
svn path=/; revision=297

13 years agoChanged curator names in application.properties; added SelectionListener to term...
preecej [Tue, 7 Feb 2012 01:32:27 +0000 (01:32 +0000)]
Changed curator names in application.properties; added SelectionListener to term lookup combobox

svn path=/; revision=296

13 years agoRight panel elements added. Done by Nikhil.
lingutln [Mon, 6 Feb 2012 22:25:11 +0000 (22:25 +0000)]
Right panel elements added. Done by Nikhil.

svn path=/; revision=295

13 years agoCorrected relative path of rotating images gallery when no custom path
preecej [Fri, 3 Feb 2012 23:47:46 +0000 (23:47 +0000)]
Corrected relative path of rotating images gallery when no custom path
provided

svn path=/; revision=294

13 years agoNew themes for the Jaiswal Lab site, provided by OSU CWS in Jan 2012.
preecej [Thu, 2 Feb 2012 21:23:36 +0000 (21:23 +0000)]
New themes for the Jaiswal Lab site, provided by OSU CWS in Jan 2012.
Not dependent on CWS, will branch and modify/debug locally only as
needed. Note: Standard and Confident themes each have dependencies on OSU
Drupal 1_11 theme. All must be present in Drupal instance for proper
operation.

svn path=/; revision=293

13 years agoAdded two fields and alignments to the right panel. Done by Nikhil.
lingutln [Wed, 1 Feb 2012 23:47:37 +0000 (23:47 +0000)]
Added two fields and alignments to the right panel. Done by Nikhil.

svn path=/; revision=292

13 years agoRefactored web service response term data into Term object. Created Term class; now...
preecej [Tue, 31 Jan 2012 23:25:19 +0000 (23:25 +0000)]
Refactored web service response term data into Term object. Created Term class; now used by term lookup dropdown and "term edit" popup dialogue. Should also be added to term label, term detail web service response and file metadata export.

svn path=/; revision=291

13 years agoallow sif file to be a source of gene information
athreyab [Tue, 31 Jan 2012 22:56:55 +0000 (22:56 +0000)]
allow sif file to be a source of gene information

svn path=/; revision=290

13 years agoRight panel modifications. Done by Nikhil.
lingutln [Tue, 31 Jan 2012 21:56:32 +0000 (21:56 +0000)]
Right panel modifications. Done by Nikhil.

svn path=/; revision=289

13 years agoupdated list of termDetailTable items to build from an enum (up in declarations)
preecej [Tue, 31 Jan 2012 01:33:35 +0000 (01:33 +0000)]
updated list of termDetailTable items to build from an enum (up in declarations)

svn path=/; revision=288

13 years agoMoved PO web service calls to application.properties file; added lookup label focus...
preecej [Tue, 31 Jan 2012 00:09:44 +0000 (00:09 +0000)]
Moved PO web service calls to application.properties file; added lookup label focus listener for PO term details call

svn path=/; revision=287

13 years agoremoved sample data files and other unwanted script files
athreyab [Mon, 30 Jan 2012 22:04:22 +0000 (22:04 +0000)]
removed sample data files and other unwanted script files

svn path=/; revision=286

13 years agoUpdated for newer version of physcomitrella fasta file
elserj [Mon, 30 Jan 2012 21:46:02 +0000 (21:46 +0000)]
Updated for newer version of physcomitrella fasta file

svn path=/; revision=285

13 years agoLayout changes. Done by Nikhil.
lingutln [Mon, 30 Jan 2012 21:23:23 +0000 (21:23 +0000)]
Layout changes. Done by Nikhil.

svn path=/; revision=284

13 years agoImageMap functionality for multiple labels. Done by Nikhil.
lingutln [Mon, 30 Jan 2012 00:03:11 +0000 (00:03 +0000)]
ImageMap functionality for multiple labels. Done by Nikhil.

svn path=/; revision=283

13 years agosupport for looking up existing species information
athreyab [Sun, 29 Jan 2012 19:11:02 +0000 (19:11 +0000)]
support for looking up existing species information

svn path=/; revision=282

13 years agoStubbed out termDetailTable control on the right panel
preecej [Thu, 26 Jan 2012 23:50:30 +0000 (23:50 +0000)]
Stubbed out termDetailTable control on the right panel

svn path=/; revision=281

13 years agoMulti segment saving to imagemaps (partially done). Done by Nikhil.
lingutln [Thu, 26 Jan 2012 19:42:18 +0000 (19:42 +0000)]
Multi segment saving to imagemaps (partially done). Done by Nikhil.

svn path=/; revision=280

13 years agoaddressed a few review comments from Justin
athreyab [Thu, 26 Jan 2012 01:50:36 +0000 (01:50 +0000)]
addressed a few review comments from Justin

svn path=/; revision=279