Hello!
To see the file structure, click on "tree".
Note that updates take place every 10 minutes, commits may not be seen immediately.
miles [Fri, 25 Oct 2013 20:20:13 +0000 (20:20 +0000)]
added multiple screens (activities), switching mechanism
updated buttons (different looks when pressed)
fixed some crash errors
new icon!
started adding items via the app
fixed some bugs that were causing data to be switched around
svn path=/; revision=514
miles [Mon, 21 Oct 2013 23:15:29 +0000 (23:15 +0000)]
update user interface
buttons
colors
added web posting for more information
svn path=/; revision=513
miles [Fri, 18 Oct 2013 18:07:04 +0000 (18:07 +0000)]
working image capture
working server interaction, displays correct information about scanned item
items can be edited through the app interface (quantity, location can be changed)
clickable linking to the web interface for detailed information
svn path=/; revision=512
miles [Tue, 24 Sep 2013 20:25:52 +0000 (20:25 +0000)]
scan initiates using webcam, but even though the scan appears to be successful, rather than returning to the main activity and parsing the results the webcam continues to scan indefinitely.
svn path=/; revision=511
miles [Mon, 23 Sep 2013 20:12:57 +0000 (20:12 +0000)]
bitmap seems to be saved, but upon opening up the gallery no photo exists.
svn path=/; revision=510
miles [Mon, 23 Sep 2013 19:27:47 +0000 (19:27 +0000)]
try again at saving the barcode to the photo gallery - appears to work, but then crashes after a few seconds. No photo saved.
svn path=/; revision=509
miles [Fri, 20 Sep 2013 23:49:55 +0000 (23:49 +0000)]
code compiles, for some reason we cannot store a bitmap to be printed. otherwise code appears to be working.
svn path=/; revision=508
miles [Fri, 20 Sep 2013 22:59:37 +0000 (22:59 +0000)]
working bitmap creation code
svn path=/; revision=507
miles [Fri, 20 Sep 2013 21:34:03 +0000 (21:34 +0000)]
no changes, just compiled the apk
svn path=/; revision=506
elserj [Fri, 20 Sep 2013 21:06:15 +0000 (21:06 +0000)]
compiled zxing jar added
svn path=/; revision=505
miles [Fri, 20 Sep 2013 20:54:27 +0000 (20:54 +0000)]
*HAS ERROS*
Added PrintDialogActivity.java, and print_dialog.xml, implemented code to print qr codes via cloud print
svn path=/; revision=504
miles [Thu, 19 Sep 2013 23:03:43 +0000 (23:03 +0000)]
set up information passing infrastructure
svn path=/; revision=503
miles [Thu, 19 Sep 2013 22:26:18 +0000 (22:26 +0000)]
now makes use of IntentIntegrator, rather than just Intent
svn path=/; revision=502
miles [Tue, 17 Sep 2013 21:55:53 +0000 (21:55 +0000)]
svn path=/; revision=501
elserj [Tue, 17 Sep 2013 21:39:55 +0000 (21:39 +0000)]
commit with zxing lib included
svn path=/; revision=500
miles [Tue, 17 Sep 2013 21:00:49 +0000 (21:00 +0000)]
first try at integrating google's barcode scanner
svn path=/; revision=499
elserj [Tue, 17 Sep 2013 19:47:43 +0000 (19:47 +0000)]
Initial commit for lab inventory program
svn path=/; revision=498
elserj [Tue, 17 Sep 2013 19:47:03 +0000 (19:47 +0000)]
Initial import.
svn path=/; revision=497
preecej [Fri, 9 Aug 2013 20:01:31 +0000 (20:01 +0000)]
Begin edits on adding multi-ontology feature.
svn path=/; revision=496
elserj [Thu, 25 Jul 2013 20:07:01 +0000 (20:07 +0000)]
Fix coding mistake from previous revision
svn path=/; revision=495
elserj [Thu, 25 Jul 2013 20:01:29 +0000 (20:01 +0000)]
Fixed for times when no genus + species
svn path=/; revision=494
preecej [Wed, 24 Jul 2013 18:00:17 +0000 (18:00 +0000)]
hello_world program
svn path=/; revision=493
preecej [Wed, 24 Jul 2013 17:48:28 +0000 (17:48 +0000)]
first python program
svn path=/; revision=492
preecej [Wed, 24 Jul 2013 17:47:14 +0000 (17:47 +0000)]
new python folder
svn path=/; revision=491
elserj [Fri, 28 Jun 2013 23:41:08 +0000 (23:41 +0000)]
Now needs a supplied species list file. No longer needs to be manually edited to enter species names
svn path=/; revision=490
elserj [Fri, 28 Jun 2013 23:08:13 +0000 (23:08 +0000)]
Fixed to use dbifloret (generalizes the script so it doesn't have to be modfied by hand for each database)
svn path=/; revision=489
elserj [Fri, 28 Jun 2013 23:07:32 +0000 (23:07 +0000)]
Added new species
svn path=/; revision=488
preecej [Wed, 12 Jun 2013 22:08:33 +0000 (22:08 +0000)]
new script for teasing out UniProt::locus mappings for A.th.
svn path=/; revision=487
preecej [Thu, 6 Jun 2013 23:10:38 +0000 (23:10 +0000)]
svn path=/; revision=486
preecej [Thu, 6 Jun 2013 22:29:17 +0000 (22:29 +0000)]
Updated for AraCyc 10 run
svn path=/; revision=485
elserj [Fri, 31 May 2013 22:36:02 +0000 (22:36 +0000)]
Oops, duplicate variable name
svn path=/; revision=484
elserj [Fri, 31 May 2013 22:05:51 +0000 (22:05 +0000)]
Added tomato
svn path=/; revision=483
lingutln [Thu, 30 May 2013 18:39:04 +0000 (18:39 +0000)]
Added the create procedure statement for import_annotated_term
svn path=/; revision=482
lingutln [Mon, 20 May 2013 20:21:33 +0000 (20:21 +0000)]
Latest commits. All queries are changes to use stored procedures.
svn path=/; revision=481
elserj [Thu, 16 May 2013 22:30:35 +0000 (22:30 +0000)]
Added new fish species
svn path=/; revision=480
preecej [Tue, 14 May 2013 21:24:18 +0000 (21:24 +0000)]
updated to v0.3
svn path=/; revision=479
lingutln [Fri, 10 May 2013 23:28:50 +0000 (23:28 +0000)]
Updated annotated_image stored_procedure.
svn path=/; revision=478
lingutln [Fri, 10 May 2013 23:25:44 +0000 (23:25 +0000)]
Updated annotated_image stored procedure
svn path=/; revision=477
lingutln [Fri, 10 May 2013 23:24:29 +0000 (23:24 +0000)]
used stored_procedure for annotated_image table
svn path=/; revision=476
lingutln [Fri, 10 May 2013 22:56:35 +0000 (22:56 +0000)]
Change some insertions through stored procedures and password hiding.
svn path=/; revision=475
lingutln [Thu, 9 May 2013 18:19:45 +0000 (18:19 +0000)]
Updated comments in stored_procedure.sql file
svn path=/; revision=474
lingutln [Thu, 9 May 2013 18:14:33 +0000 (18:14 +0000)]
Added stored procedures file
svn path=/; revision=473
preecej [Wed, 8 May 2013 21:35:19 +0000 (21:35 +0000)]
no longer needed; just an example
svn path=/; revision=472
lingutln [Tue, 7 May 2013 20:34:47 +0000 (20:34 +0000)]
Latest commits.
svn path=/; revision=471
preecej [Mon, 6 May 2013 22:05:39 +0000 (22:05 +0000)]
quick stored proc db test
svn path=/; revision=470
lingutln [Wed, 24 Apr 2013 22:43:11 +0000 (22:43 +0000)]
Deleted
svn path=/; revision=469
lingutln [Wed, 24 Apr 2013 22:41:31 +0000 (22:41 +0000)]
File reorganizatio and initial checkins for data import scripts
svn path=/; revision=468
miles [Tue, 23 Apr 2013 23:03:24 +0000 (23:03 +0000)]
View Ontology Changes:
- many small bug fixes
- solved the term cut-off problem
- solved the gene cut-off problems
svn path=/; revision=467
lingutln [Thu, 11 Apr 2013 19:37:34 +0000 (19:37 +0000)]
Added Character encoding for synonyms table
svn path=/; revision=466
lingutln [Wed, 10 Apr 2013 23:14:31 +0000 (23:14 +0000)]
svn path=/; revision=465
miles [Tue, 9 Apr 2013 22:33:12 +0000 (22:33 +0000)]
View Ontology Changes
- download tab delimited file button now only includes currently
visible terms
svn path=/; revision=464
miles [Tue, 9 Apr 2013 22:12:42 +0000 (22:12 +0000)]
Heatmap Changes:
- jump to gene button is now working
svn path=/; revision=463
miles [Tue, 9 Apr 2013 22:11:07 +0000 (22:11 +0000)]
Heatmap Changes:
- jump to cluster button is now working
- jump to gene is still not
svn path=/; revision=462
miles [Tue, 9 Apr 2013 22:04:18 +0000 (22:04 +0000)]
View Ontology Changes:
-jump to gene button is now working in the ontology map
- Bug detected in HeatMap: jump to cluster and jump to gene buttons are
no longer working
svn path=/; revision=461
lingutln [Fri, 5 Apr 2013 19:41:59 +0000 (19:41 +0000)]
More changes to UI. Done by Nikhil.
svn path=/; revision=460
miles [Fri, 5 Apr 2013 00:47:04 +0000 (00:47 +0000)]
View Ontology Changes:
-Error messages made bigger, clearer
Info Choice Changes:
-User now has the option of choosing sort criteria
-Deleted a lot of old, useless code. Much nicer now.
svn path=/; revision=459
miles [Fri, 5 Apr 2013 00:09:45 +0000 (00:09 +0000)]
View Ontology Changes:
-downloaded tab delimited file now has 0,0 field
-ontologies can now be dynamically viewed or ignored
svn path=/; revision=458
lingutln [Thu, 4 Apr 2013 20:26:59 +0000 (20:26 +0000)]
svn path=/; revision=457
lingutln [Thu, 4 Apr 2013 19:30:38 +0000 (19:30 +0000)]
Add toggling between Segmentation and Labelling modes. Done by Nikhil.
svn path=/; revision=456
lingutln [Tue, 2 Apr 2013 20:45:43 +0000 (20:45 +0000)]
Add TextLabels to some UI icons and removed unnecessary icons. From Nikhil.
svn path=/; revision=455
miles [Wed, 27 Mar 2013 21:40:41 +0000 (21:40 +0000)]
minor visual enhancements to view ontology and heatmap, mostly to do
with scrolling
svn path=/; revision=454
miles [Wed, 27 Mar 2013 21:09:36 +0000 (21:09 +0000)]
VO Download Changes:
-removed excess tabs
-couldn't find the cause of the excess newline, suspect that it
is an artifact of fwrite() function
svn path=/; revision=453
miles [Wed, 27 Mar 2013 20:43:57 +0000 (20:43 +0000)]
View Ontology Changes:
-namespace selection now fully functional, error messages
updated and made relevant
Info Choice Changes:
-namespace selection support
-minor javascript changes
svn path=/; revision=452
miles [Wed, 27 Mar 2013 19:04:12 +0000 (19:04 +0000)]
View Ontology Changes:
-now strips out any genes that haven't been annotated from the
search paramters, and doesn't display them in the ontology
-supports cluster and box ontologies from Heatmap
svn path=/; revision=451
miles [Wed, 27 Mar 2013 18:22:23 +0000 (18:22 +0000)]
Info Choice Changes:
-view ontology button now works for both box and cluster
searches
svn path=/; revision=450
miles [Tue, 26 Mar 2013 23:30:12 +0000 (23:30 +0000)]
View Ontology Changes:
-download as tab delimited file fully functional
-check boxes for selecting or deselecting downloaded terms
functional
svn path=/; revision=449
miles [Tue, 26 Mar 2013 20:58:51 +0000 (20:58 +0000)]
View Ontology Changes:
-VOdownload.php made
-download button implimented
-downloading tab delimited file is now working
svn path=/; revision=448
miles [Tue, 26 Mar 2013 20:02:40 +0000 (20:02 +0000)]
View Ontology Changes:
-check boxes are now working
svn path=/; revision=447
miles [Tue, 26 Mar 2013 19:23:03 +0000 (19:23 +0000)]
View Ontology Changes:
-genes are now clickable, and take the user to the Plant
Ontology annotation search for the relevant gene
-more detailed user instructions
svn path=/; revision=446
miles [Tue, 26 Mar 2013 19:05:58 +0000 (19:05 +0000)]
View Ontology Changes:
-random column colors is working
-columns have a color key
svn path=/; revision=445
miles [Mon, 25 Mar 2013 23:34:14 +0000 (23:34 +0000)]
View Ontology Changes:
-linking to ontology term is now working
HeatMap Changes:
-Minor refactoring
svn path=/; revision=444
miles [Mon, 25 Mar 2013 22:06:37 +0000 (22:06 +0000)]
View Ontology Changes:
-legend now displays useful information
-added evidence counts into the chart
-distinguished between anatomy and growth terms
svn path=/; revision=443
preecej [Mon, 25 Mar 2013 21:25:08 +0000 (21:25 +0000)]
Moved the IADB project out of Balaji's Personnel folder to the
jaiswallab/ projects level
svn path=/; revision=442
miles [Mon, 25 Mar 2013 20:58:28 +0000 (20:58 +0000)]
View Ontology Changes:
-evidence count is now included in the returned mysql table; not
yet included in the actual website
svn path=/; revision=441
miles [Mon, 25 Mar 2013 19:57:16 +0000 (19:57 +0000)]
View Ontology Changes:
-side scrolling
-automatic heigth and width adjustments
-automatic top and side offsets
-some code refactoring
-PO Number now included in term
svn path=/; revision=440
miles [Fri, 22 Mar 2013 00:45:01 +0000 (00:45 +0000)]
discovered a bunch of failings in view Ontology, fixed them
optimized the view Ontology queries so that it can now handle at least
100 times as many genes, probably more; it runs significantly faster and
uses some joins in mysql to organize the data
svn path=/; revision=439
miles [Sat, 16 Mar 2013 00:42:40 +0000 (00:42 +0000)]
Working copy, made some optimization changes to heatMap.php: these may
need to be debugged as time goes on. Nothing jumps out at me however.
No more funky scrollLeftOffset or scrollRightOffset
svn path=/; revision=438
miles [Fri, 15 Mar 2013 23:33:26 +0000 (23:33 +0000)]
working revision, including the view ontology capability. Colors changed
in the ontology viewer from blue -> yellow to blue -> green
svn path=/; revision=437
miles [Fri, 15 Mar 2013 22:42:37 +0000 (22:42 +0000)]
not sure if heatmap is working, wanted something to revert to
svn path=/; revision=436
elserj [Wed, 13 Mar 2013 21:16:12 +0000 (21:16 +0000)]
Added counts for obsolete terms and total number of terms
svn path=/; revision=435
elserj [Wed, 13 Mar 2013 21:10:53 +0000 (21:10 +0000)]
Added script that can take an obo file and tell you how many non-obsolete terms exist
svn path=/; revision=434
miles [Wed, 13 Mar 2013 01:11:04 +0000 (01:11 +0000)]
svn path=/; revision=433
miles [Wed, 13 Mar 2013 01:09:44 +0000 (01:09 +0000)]
Term printing is now woring in viewOntology.php, nothing else has
currently been implimented here. Still to do: Gene printing, cell
coloring
svn path=/; revision=432
miles [Tue, 12 Mar 2013 23:42:10 +0000 (23:42 +0000)]
Everything appears to be working, will now begin serious work on the
view ontology tool
svn path=/; revision=431
athreyab [Thu, 21 Feb 2013 05:12:18 +0000 (05:12 +0000)]
code for contact upload script
svn path=/; revision=430
athreyab [Wed, 20 Feb 2013 17:33:24 +0000 (17:33 +0000)]
image annotation db schema files - load sql script, workbench schema file and image
svn path=/; revision=429
athreyab [Wed, 20 Feb 2013 17:27:34 +0000 (17:27 +0000)]
html 5 based prototype for web view of image annotation data - folder contains several implemenations - decide on one later
svn path=/; revision=428
lingutln [Wed, 30 Jan 2013 00:09:54 +0000 (00:09 +0000)]
Commented out active learning code. By Nikhil.
svn path=/; revision=427
lingutln [Wed, 30 Jan 2013 00:08:07 +0000 (00:08 +0000)]
Commented incomplete ActiveLearning code. By Nikhil.
svn path=/; revision=426
lingutln [Wed, 30 Jan 2013 00:00:33 +0000 (00:00 +0000)]
Resolved list drop down problem in Windows machines. Done by Nikhil.
svn path=/; revision=425
preecej [Wed, 23 Jan 2013 23:55:41 +0000 (23:55 +0000)]
Included dimers, and left a commented line for equivalent SSR counts
svn path=/; revision=424
preecej [Wed, 23 Jan 2013 22:58:26 +0000 (22:58 +0000)]
First draft
svn path=/; revision=423
preecej [Wed, 23 Jan 2013 22:30:11 +0000 (22:30 +0000)]
Initial copy from B.sylvaticum version, unmodified.
svn path=/; revision=422
elserj [Thu, 27 Dec 2012 19:18:07 +0000 (19:18 +0000)]
Added new sources
svn path=/; revision=421
naithans [Fri, 21 Dec 2012 22:51:11 +0000 (22:51 +0000)]
simple entities changed from RiceCyc to reactome
svn path=/; revision=420
naithans [Fri, 21 Dec 2012 22:50:00 +0000 (22:50 +0000)]
simple entities are from reactome databse not from ricecyc
svn path=/; revision=419
naithans [Fri, 21 Dec 2012 22:49:22 +0000 (22:49 +0000)]
In the curated folder, three pathways related to GA Biosynthesis. Here the simple entities were changed from riceCyc source to the reactome existing entries.
svn path=/; revision=418
miles [Thu, 6 Dec 2012 00:56:49 +0000 (00:56 +0000)]
jump to cluster unbroken
svn path=/; revision=417
miles [Tue, 20 Nov 2012 23:53:06 +0000 (23:53 +0000)]
now all species requested will appear, regardless of relevance, in their
original alphanumberical order. much bug fixing. download as jpg working
again.
svn path=/; revision=416
miles [Mon, 19 Nov 2012 23:33:11 +0000 (23:33 +0000)]
Fixed species inclusion to show even irrelevant species if asked.
Improved summary of data.
svn path=/; revision=415