mussa.git
17 years agoManual: UCSC Update, Copy sequence, Sub-analysis
Brandon King [Thu, 6 Jul 2006 20:45:51 +0000 (20:45 +0000)]
Manual: UCSC Update, Copy sequence, Sub-analysis

 * Added more screenshots
 * Updated UCSC Genome Browser sequence retrieval information
 * Copy sequence to clipboard section added
 * Subanalysis section added

17 years agoEmpty Subanalyses should not be run
Diane Trout [Thu, 6 Jul 2006 19:36:38 +0000 (19:36 +0000)]
Empty Subanalyses should not be run
brandon found a problem ticket:110 where clicking run with an empty
set of sequences caused a segfault. This patch disables the run button
when the model is empty.

17 years agoWrite cmake scripts for building the html manual
Diane Trout [Thu, 6 Jul 2006 01:40:44 +0000 (01:40 +0000)]
Write cmake scripts for building the html manual
this is also the start of some docutils CMAKE support

17 years agoSequenceLocationModel::clear should actually clear the model.
Diane Trout [Wed, 5 Jul 2006 22:29:44 +0000 (22:29 +0000)]
SequenceLocationModel::clear should actually clear the model.
a cut-n-paste error meant that it actually just removed one element.

17 years agoremove MotifDetail:: from function in class declaration
Diane Trout [Wed, 5 Jul 2006 06:00:23 +0000 (06:00 +0000)]
remove MotifDetail:: from function in class declaration

17 years agoSequenceLocation was being intialized with left,right
Diane Trout [Sat, 1 Jul 2006 06:19:05 +0000 (06:19 +0000)]
SequenceLocation was being intialized with left,right
not left,count. this made the getSubsequence rather wrong when the
'right' side was being used as a count.

17 years agomake sure subsequences have a species name
Diane Trout [Sat, 1 Jul 2006 06:18:07 +0000 (06:18 +0000)]
make sure subsequences have a species name
copy species name from our source sequence

17 years agomake subanalysis window editable
Diane Trout [Sat, 1 Jul 2006 04:40:58 +0000 (04:40 +0000)]
make subanalysis window editable
one can now edit the left and right sequence positions for the subanalysis
mode.

17 years agoImplement UI for subanalysis mode
Diane Trout [Sat, 1 Jul 2006 04:21:30 +0000 (04:21 +0000)]
Implement UI for subanalysis mode
unfortunately its still only a read-only user interface but
the a user can select a sequence region, add it to our track display
and then either cancel or run the analysis.

It unfortunately blocks the UI while it runs, but there's not a whole lot
I can do about that.

While implementing this I added a number of unittests to make sure
that my sequence selection code workes.

17 years agofix boost::python sequence interface
Diane Trout [Fri, 30 Jun 2006 20:37:58 +0000 (20:37 +0000)]
fix boost::python sequence interface
Making sequence a subclass of string caused some problems for
the boost::python sequence class. This updates the interface so it
works again.

17 years agostore motifs as sequences instead of strings
Diane Trout [Fri, 30 Jun 2006 01:22:50 +0000 (01:22 +0000)]
store motifs as sequences instead of strings
this gives me a place to store at least some annotation information
about a motif.

17 years agoAllow disabling motifs
Diane Trout [Fri, 30 Jun 2006 00:35:36 +0000 (00:35 +0000)]
Allow disabling motifs
So this adds a check box that'll let one enable/disable a motif
though i really should think about adding some headers ot my dialog box
or perhaps even use a table widget of somet type.

17 years agomove edit motifs to the edit menu option
Diane Trout [Fri, 30 Jun 2006 00:34:58 +0000 (00:34 +0000)]
move edit motifs to the edit menu option

17 years agoset_motifs should erase the previous motifs
Diane Trout [Thu, 29 Jun 2006 21:40:53 +0000 (21:40 +0000)]
set_motifs should erase the previous motifs
I renamed add_motifs to set_motifs as I was expecting that the function
would clear out the previous motifs that were stored in the analysis.
this should fix ticket:95

17 years agoallow specifying a name for a sequence
Diane Trout [Thu, 29 Jun 2006 01:48:46 +0000 (01:48 +0000)]
allow specifying a name for a sequence
provide a place for specifying a species name for a sequence track
in the define analysis gui.

17 years agoupdate the annotation grammer to make species name optional
Diane Trout [Thu, 29 Jun 2006 01:18:28 +0000 (01:18 +0000)]
update the annotation grammer to make species name optional

17 years agoview sequence alignment is a more biologically useful name
Diane Trout [Thu, 29 Jun 2006 01:17:38 +0000 (01:17 +0000)]
view sequence alignment is a more biologically useful name
change the menu name to be a little more informative.

17 years agobreak the core of add_motifs loop into a seperate function
Diane Trout [Thu, 29 Jun 2006 01:16:00 +0000 (01:16 +0000)]
break the core of add_motifs loop into a seperate function

17 years agoAllow setting a name for a motif
Diane Trout [Thu, 29 Jun 2006 00:20:32 +0000 (00:20 +0000)]
Allow setting a name for a motif
its a quick hack, but there's now a field for entering a name for a motif
though it'd be nice to change the dialog box to use Qts MVC classes.

17 years agoTailorization
Diane Trout [Mon, 26 Jun 2006 22:30:45 +0000 (22:30 +0000)]
Tailorization
Import of the upstream sources from
 Repository: /home/diane/proj/tailor/mussa/mussa.hashed
       Kind: darcs
   Revision: SequenceLocationModel improvements

17 years agoGetting closer to a subanalysis mode
Diane Trout [Fri, 23 Jun 2006 01:56:58 +0000 (01:56 +0000)]
Getting closer to a subanalysis mode
This is a big patch, in order to create the subanalysis mode I wanted a
class that'd hold a reference to a sequence and some start/stop locations
which'd let the user edit what region they want to use in the subanalysis
before creating the new analysis.

I started setting up a SequenceLocation and SequenceLocationModel (for
the qt MVC classes) but then I learned that C++ reference types aren't
particularly good things to store in containers, as when the original
variable that all the references are pointing to goes away you get
invalid memory exceptions.

So I went through and switched most of those references to the
boost::shared_ptr which is a fairly simple reference counted pointer.

This did make most of the C++ code happy, but my python wrapping
is increasingly losing functionality.

Also as a bonus this increased use of pointers I think will improve the
sharing of the AnnotationColors color mappers.

17 years agoMore progress toward subanalysis
Diane Trout [Wed, 21 Jun 2006 02:11:45 +0000 (02:11 +0000)]
More progress toward subanalysis
With our previous efforts at turnning Sequence into a string, the
places where we were comparing a Sequence to a string didn't work so well.
So this patch lets the compiler cast strings and const char *s to Sequence.

additionally I made the copySelectedTrackAs functions a bit more generic
by making the base function copySelectedTracks a template function
that returns a list of formatted objects. The two string style copy
functions AsFasta and AsString, then needed a bit more code to convert
the list back into a string. But I needed this so I can let users
edit what regions they want for SubanalysisWindows.

And lastly, there's a very simple box for defining a subanalysis that
still needs to be connected to the above copy functions.

17 years agouse a specific exception when nextTo breaks
Diane Trout [Wed, 21 Jun 2006 02:05:03 +0000 (02:05 +0000)]
use a specific exception when nextTo breaks
throw conserved_path_size_mismatch, hopefully we can catch it at some point
and then reset that analysis (hopefully).

I'd like to know why it breaks?

17 years agoextend annotation names and types to allow punctuation
Diane Trout [Tue, 20 Jun 2006 20:52:42 +0000 (20:52 +0000)]
extend annotation names and types to allow punctuation
I tweaked the spirit grammar so the name & type fields are letter followed
by "non-space printing characters"

17 years agoadd view alignment to the sequence browser context menu
Diane Trout [Sat, 17 Jun 2006 02:18:39 +0000 (02:18 +0000)]
add view alignment to the sequence browser context menu

17 years agomake Sequence a subclass of std::string
Diane Trout [Sat, 17 Jun 2006 02:13:46 +0000 (02:13 +0000)]
make Sequence a subclass of std::string
There were a lot of changes associated with making Sequence a subclass
of std::string. Hopefully that'll make it easier for me to use paircomp
at some point.

However the major useful new feature is subseq now returns a Sequence
instead of a string, and this sub-sequence has the header copied over
and the annotations copied (and their start/end locations adjusted).

Additionally this patch includes adding the coordianates copied with the
copySelectedSequenceAsFasta command to the header.

I'm getting closer to have the parts needed to do a sub-analysis.

17 years agoremove unnecessary class decoration
Diane Trout [Fri, 16 Jun 2006 05:38:37 +0000 (05:38 +0000)]
remove unnecessary class decoration
would you believe that you don't need the name of the class inside the
class declaration?

17 years agoticket:104 fix some pointer problems with MussaAlignedWindow
Diane Trout [Fri, 16 Jun 2006 00:33:49 +0000 (00:33 +0000)]
ticket:104 fix some pointer problems with MussaAlignedWindow
the vector of MussaAlignedWindow * was having prolems with a double delete.
when a MussaAlignedWindow was open and one tried to load a different
analysis, the code that was closing all of the open windows crashed.

when I found boost::shared_ptr to fix it, I then found a problem
with the Qt trying to delete my shared zoom object which was also
causing a crash. This should have all of that fixed, and as a bonus
the new analysis doesn't have any of the old analysis' selections open.

17 years agoshare one instance of the copySelectedSequenceAsFastaAction
Diane Trout [Thu, 15 Jun 2006 22:34:58 +0000 (22:34 +0000)]
share one instance of the copySelectedSequenceAsFastaAction
create the copySelectedSequenceAsFastaAction in the inner-most class
and provide accessors so all the other appropriate levels can stick it
in their menus.

The weakness to this is if we ever let users override keybindings

17 years agoDisabled code to try and get bundle path on OS X
Diane Trout [Thu, 15 Jun 2006 17:57:45 +0000 (17:57 +0000)]
Disabled code to try and get bundle path on OS X

17 years agoTell CMake not to include QtAssistant if not available
Diane Trout [Thu, 15 Jun 2006 06:23:30 +0000 (06:23 +0000)]
Tell CMake not to include QtAssistant if not available

17 years agobe more informative when DISPLAY isn't set under unix
Diane Trout [Thu, 15 Jun 2006 06:10:29 +0000 (06:10 +0000)]
be more informative when DISPLAY isn't set under unix

17 years agotry to make including QtAssistant optional
Diane Trout [Thu, 15 Jun 2006 06:01:38 +0000 (06:01 +0000)]
try to make including QtAssistant optional

17 years agodon't bother to build the old fltk code base
Diane Trout [Thu, 15 Jun 2006 05:58:39 +0000 (05:58 +0000)]
don't bother to build the old fltk code base

17 years agoAMD64 build support
Diane Trout [Wed, 14 Jun 2006 22:32:38 +0000 (22:32 +0000)]
AMD64 build support
AMD64 needs some -fPICs to build correctly

17 years agoMake cmake happier about my target declariation order
Diane Trout [Wed, 14 Jun 2006 21:58:01 +0000 (21:58 +0000)]
Make cmake happier about my target declariation order
recent versions of cmake reported that my ordering would break
some of the dependency analysis, this patch cleans that warning up.

17 years agoimplement selection context menu
Diane Trout [Wed, 14 Jun 2006 02:43:50 +0000 (02:43 +0000)]
implement selection context menu
so it isn't perfect, left clicking can cause it to get confused and lose
the selection. But it mostly works if one doesn't taunt it too much.

17 years agoreformat some braces
Diane Trout [Wed, 14 Jun 2006 02:42:05 +0000 (02:42 +0000)]
reformat some braces

17 years agoinclude the sequence coordinates when copying sequence
Diane Trout [Tue, 13 Jun 2006 23:31:38 +0000 (23:31 +0000)]
include the sequence coordinates when copying sequence

17 years agoSequenceBrowser should handle the copying
Diane Trout [Tue, 13 Jun 2006 19:39:22 +0000 (19:39 +0000)]
SequenceBrowser should handle the copying
viva encapsulation, I pushed the code to handle copying sequence
down into the SequenceBrowser from SequenceBrowserWidget on the idea
that someone might want to use the inner widget on its own.

Hmm... maybe that's not reasonable? Not sure anymore. However
I do think that I want the popup menu to be tied to the innermost widget.

17 years agoManual: last modified update
Brandon King [Mon, 12 Jun 2006 23:35:37 +0000 (23:35 +0000)]
Manual: last modified update

17 years agoManual: UCSC Genome Browser section
Brandon King [Mon, 12 Jun 2006 23:32:43 +0000 (23:32 +0000)]
Manual: UCSC Genome Browser section

17 years agoManual: UCSC Genome Browser screenshot pack
Brandon King [Mon, 12 Jun 2006 23:31:39 +0000 (23:31 +0000)]
Manual: UCSC Genome Browser screenshot pack

17 years agoalg/glseqbrowser.cpp:127: error: jump to case label
Brandon King [Mon, 12 Jun 2006 22:29:56 +0000 (22:29 +0000)]
alg/glseqbrowser.cpp:127: error: jump to case label

Fixes the following:
alg/glseqbrowser.cpp: In member function oid GlSeqBrowser::processSelection(GLuint, GLuint*, GLuint, const GlSeqBrowser::rect<float>&)
alg/glseqbrowser.cpp:127: error: jump to case label
alg/glseqbrowser.cpp:120: error:  crosses initialization of nt rightalg/glseqbrowser.cpp:119: error:  crosses initialization of nt leftalg/glseqbrowser.cpp: In member function oid GlSeqBrowser::copySelectedTracks(std::string&, std::string (*)(const Sequence&, int, int))
alg/glseqbrowser.cpp:399: warning: comparison between signed and unsigned integer expressions
make: *** [glseqbrowser.o Error 1

17 years agoremove a useless debugging message
Diane Trout [Mon, 12 Jun 2006 22:16:51 +0000 (22:16 +0000)]
remove a useless debugging message

17 years agoActually copy our selected sequence to the clipboard
Diane Trout [Mon, 12 Jun 2006 22:15:32 +0000 (22:15 +0000)]
Actually copy our selected sequence to the clipboard

17 years agopartial implementation of sequence track copy
Diane Trout [Sat, 10 Jun 2006 02:38:47 +0000 (02:38 +0000)]
partial implementation of sequence track copy
this includes the code to track the portion of a sequence track that
has been selected, and provides a MussaWindow option to "copy" the selection
as a fasta file.

However the selection doesn't go to the clipboard yet, and the
MussaAlignedWindow also needs the option.

The actual Qt Slot that calls the glseqbrowser::copySelectedTrackAsFasta
is in the SequenceBrowserWidget.

17 years agoMore robust eol handling for Sequence::load_fasta
Diane Trout [Fri, 9 Jun 2006 21:35:07 +0000 (21:35 +0000)]
More robust eol handling for Sequence::load_fasta
The load_fasta code used getline() which only uses "native" end of line
conventions. Unfortunately for me OS X has "native" and "backwards
compatible" eol conventions (which aren't compatible). So this patch
will accept  CR, CR-LF, LF, and because I was lazy LF-CR.

I also unit tested that which required breaking load_fasta into a
function that  handles loading from a file name and one that works
from an iostream.

17 years agoimprove fasta parsing
Diane Trout [Thu, 8 Jun 2006 22:23:09 +0000 (22:23 +0000)]
improve fasta parsing
This extends the parser to use both upper & lower case iupac symbols for
our annotation file. (And also I'm trying to simplify the grammar).
Additionally this patch also throws an error message when the result of
reading a fasta sequence is empty.

17 years agominor ui label tweaks
Diane Trout [Thu, 8 Jun 2006 01:31:40 +0000 (01:31 +0000)]
minor ui label tweaks
The end users wanted more explanatory text on the browser and slightly
different menu text.

17 years agominor improvements to python embedding code
Diane Trout [Thu, 8 Jun 2006 01:25:46 +0000 (01:25 +0000)]
minor improvements to python embedding code
tweak the cmake files a bit, and shorten the namespace name

17 years agoReport error when sequence couldn't be loaded
Diane Trout [Thu, 8 Jun 2006 01:23:09 +0000 (01:23 +0000)]
Report error when sequence couldn't be loaded
Report something a bit more meaningful when unable to parse some sequence
out of a fasta file.

17 years agoTurn on more doxygen features
Diane Trout [Thu, 8 Jun 2006 01:20:49 +0000 (01:20 +0000)]
Turn on more doxygen features
Sourcebrowser looks neat, it allows seeing the source from the documentation
and provides some references/refered by

17 years agoManual: Progress towards retrieval data for mussa section
Brandon King [Wed, 7 Jun 2006 23:59:45 +0000 (23:59 +0000)]
Manual: Progress towards retrieval data for mussa section

17 years agoManual Image Pack: UCSC Genome Broswer data retrieval screenshots
Brandon King [Wed, 7 Jun 2006 23:58:31 +0000 (23:58 +0000)]
Manual Image Pack: UCSC Genome Broswer data retrieval screenshots

17 years agokeep track of how far through a seqcomp we've gotten
Diane Trout [Tue, 6 Jun 2006 00:21:45 +0000 (00:21 +0000)]
keep track of how far through a seqcomp we've gotten

17 years agouse Qt Signals & Slots for progress tracking
Diane Trout [Sat, 3 Jun 2006 01:58:40 +0000 (01:58 +0000)]
use Qt Signals & Slots for progress tracking
this replaces my first attempt that used boost signals (which is now
removed from the repository).

Mussa and NwayPaths now inherit from QObject and can emit a progress
signal to give some indication of how far they've gotten at long running
tasks. Though I don't have a solution for long running seqcomps yet.

Also instead of hard coding a % constant to cut down on the number of calls
to emit the signal, I should use some kind of timer.

17 years agoWarning dialog upon Mussa Manual (QAssistant) error.
Brandon King [Fri, 2 Jun 2006 19:03:15 +0000 (19:03 +0000)]
Warning dialog upon Mussa Manual (QAssistant) error.

If there is an error with QAssistant when loading the Mussagl Manual,
a warning dialog will pop up with the error message.

This patch implements ticket:97.

17 years agoadd callback for tracking analysis progress
Diane Trout [Sat, 27 May 2006 01:15:29 +0000 (01:15 +0000)]
add callback for tracking analysis progress
This version just writes the information to standard out, but
the callback should be useable bythe the GUI.

also I killed the parameters to analyze(), you need to customize the class
in order setup the analysis.

17 years agorename [gset_soft_thres to [gs]et_soft_threshold]
Diane Trout [Sat, 27 May 2006 01:08:29 +0000 (01:08 +0000)]
rename [gset_soft_thres to [gs]et_soft_threshold]

17 years agoconfigure cmake to include support for QtAssistant
Diane Trout [Sat, 27 May 2006 00:51:39 +0000 (00:51 +0000)]
configure cmake to include support for QtAssistant

17 years agoVariable declared locally elsewere... not needed.
Brandon King [Fri, 26 May 2006 21:47:59 +0000 (21:47 +0000)]
Variable declared locally elsewere... not needed.

17 years agoMussagl Manual QAssistant Profile
Brandon King [Fri, 26 May 2006 21:45:33 +0000 (21:45 +0000)]
Mussagl Manual QAssistant Profile

17 years agoMussagl Manual QAssistant Patch
Brandon King [Fri, 26 May 2006 21:11:49 +0000 (21:11 +0000)]
Mussagl Manual QAssistant Patch

 * Adds a QAssistant client for Mussagl Manual
 * New menu action -> 'Help > Mussa Manual..'
 * New action icon
 * Updated icon.qrc with new icon
 * CONFIG += assistant added to mussagl.pro

17 years agolet the keyboard reasonably control the browser window
Diane Trout [Thu, 25 May 2006 23:33:43 +0000 (23:33 +0000)]
let the keyboard reasonably control the browser window
Set tab order, single step size and page step size to make interacting with
the glseqbrowser from the keyboard a bit more pleasant.

17 years agoadd some documentation for glseqbrowser::viewport*
Diane Trout [Thu, 25 May 2006 23:32:08 +0000 (23:32 +0000)]
add some documentation for glseqbrowser::viewport*

17 years agocombine a declaration and assignment
Diane Trout [Thu, 25 May 2006 05:16:23 +0000 (05:16 +0000)]
combine a declaration and assignment

17 years agoset all the QAction pointers to 0
Diane Trout [Wed, 24 May 2006 19:12:58 +0000 (19:12 +0000)]
set all the QAction pointers to 0

17 years agoManual: View mussa alignment section + minor fixes
Brandon King [Tue, 23 May 2006 22:18:14 +0000 (22:18 +0000)]
Manual: View mussa alignment section + minor fixes

17 years agoUpdated Mussagl launched screenshot.
Brandon King [Tue, 23 May 2006 21:48:28 +0000 (21:48 +0000)]
Updated Mussagl launched screenshot.

17 years agoManual: Spelling patch
Brandon King [Tue, 23 May 2006 21:32:17 +0000 (21:32 +0000)]
Manual: Spelling patch

17 years agoScreenshot image pack (for manual)
Brandon King [Tue, 23 May 2006 21:26:12 +0000 (21:26 +0000)]
Screenshot image pack (for manual)

17 years agoConservation tracks + IUPAC Neucleotide Table
Brandon King [Tue, 23 May 2006 18:06:31 +0000 (18:06 +0000)]
Conservation tracks + IUPAC Neucleotide Table

 * Added information about conservation tracks, and the meaning of
   blue vs red track.

 * Added an IUPAC Neucleotide Table

17 years agorename ExtendedConservedPath for the old fltk code
Diane Trout [Tue, 23 May 2006 05:44:08 +0000 (05:44 +0000)]
rename ExtendedConservedPath for the old fltk code

17 years agowe should be defaulting to qt 4.1.2
Diane Trout [Mon, 22 May 2006 22:31:33 +0000 (22:31 +0000)]
we should be defaulting to qt 4.1.2

17 years agomake linking python optional
Diane Trout [Mon, 22 May 2006 22:29:20 +0000 (22:29 +0000)]
make linking python optional
I'm getting a crash when running under rosetta which i think might
be related to having linked in python. So since I'm not currently
using the embedded interpreter, lets not bother linking it in.

17 years agoturn color back on
Diane Trout [Sat, 20 May 2006 01:51:14 +0000 (01:51 +0000)]
turn color back on
reimplemnt some code to try and compute coloring things that are
reverse complimented with respect to their previous sequence as blue.

Also there was a bug in my previous patch for computing the aligned paths
where paths that partially had matched through a few of the n-way sequences
would still be added to the list of matches. (now something has to
match all the way through before being added)

17 years agoticket:62 fix local alignment
Diane Trout [Sat, 20 May 2006 01:16:26 +0000 (01:16 +0000)]
ticket:62 fix local alignment
This appears to fix the problem where the local alignment was being
miscomputed. In implementing this I collapsed ExtendedConservedPath into
ConservedPath, and I finished seperating computing the local alignment
from drawing said alignment. Once I seperated the two and could actually
call the core algorithm I was able to add some (simple) unittesting of
the local alignment code, and use some much simpler drawing code.

17 years agospecify what version of cmake is required
Diane Trout [Sat, 20 May 2006 01:11:25 +0000 (01:11 +0000)]
specify what version of cmake is required

17 years agoManual: Motif/Annotation documentation
Brandon King [Thu, 18 May 2006 23:51:55 +0000 (23:51 +0000)]
Manual: Motif/Annotation documentation

17 years agoLoad Motif List png
Brandon King [Thu, 18 May 2006 23:50:13 +0000 (23:50 +0000)]
Load Motif List png

17 years agoNew version of mussagl, updated screenshot.
Brandon King [Thu, 18 May 2006 23:23:18 +0000 (23:23 +0000)]
New version of mussagl, updated screenshot.

17 years agoManual: Main Window section added
Brandon King [Thu, 18 May 2006 23:05:18 +0000 (23:05 +0000)]
Manual: Main Window section added

17 years agoScreenshots for next patch of the manual.
Brandon King [Thu, 18 May 2006 23:04:00 +0000 (23:04 +0000)]
Screenshots for next patch of the manual.

17 years agoUpdated manual
Brandon King [Wed, 17 May 2006 16:46:41 +0000 (16:46 +0000)]
Updated manual

* Updated threshold setting based on latest build of Mussagl
* Continued outline development
* Added FIXME: where ever work needs to be done.

17 years agorename the python extension to _mussa.so
Diane Trout [Thu, 18 May 2006 00:56:12 +0000 (00:56 +0000)]
rename the python extension to _mussa.so
when working on the setup.py version of the build system it seemd like I
might want some python code to wrap the extension, so I renamed it to
_mussa. not sure if i still need that or not.

17 years agoexpose more of the sequence class to python
Diane Trout [Thu, 18 May 2006 00:55:40 +0000 (00:55 +0000)]
expose more of the sequence class to python

17 years agofinish implementing annotation by sequence
Diane Trout [Wed, 17 May 2006 19:23:45 +0000 (19:23 +0000)]
finish implementing annotation by sequence
I connected the previous find_sequence code with the new spirit annotation
loading file. So now I can actually use (nearly exact) sequences for
annotating.

17 years agoswitch to a character based spirit parser
Diane Trout [Wed, 17 May 2006 08:36:18 +0000 (08:36 +0000)]
switch to a character based spirit parser
by not letting spirit automatically deal with the spacing I was able
to actually get parsing to work correctly.

17 years agotry to read fasta blocks in the annotation file
Diane Trout [Wed, 17 May 2006 08:10:00 +0000 (08:10 +0000)]
try to read fasta blocks in the annotation file
though this also revealed some problems with the spirit parser not
really splitting on whitespace. I should look into how to do per
character parsing.

17 years agouse spirit parser for reading annot file
Diane Trout [Wed, 17 May 2006 01:57:30 +0000 (01:57 +0000)]
use spirit parser for reading annot file
This basically duplicates tristans original annot parser using boost::spirit.
That was more complicated than I thought, and required implementing
a functor struct that stored data when the class was instantiated and then
performed some action with the operator() was called. Look at the comment
at sequence.cpp:push_back_annot for more descriptions of how that worked.

I improved the annotate_from_sequence unit test to not use hard coded values.

I have the start of a unit test fort the annot parsing code.
(currently it parses a string and then dumps out the result)

Though I did run the gui using this code and annotations did show up in roughly
the right places.

17 years agoadd annotations by sequence string
Diane Trout [Tue, 16 May 2006 00:53:06 +0000 (00:53 +0000)]
add annotations by sequence string
Ok so this is a rather limited search system as it is just using the
motif searching code, but adding things to the annot list instead of the
motif list. (and it handles looking at a list of sequences).

Ideally there should be some better way of specifying which algorithm to use
but i'm really tired today and not coding well.

18 years agotry to make setup.py multiplatform
Diane Trout [Thu, 11 May 2006 03:20:43 +0000 (03:20 +0000)]
try to make setup.py multiplatform

18 years agominor tweaks for building mussa under setup.py
Diane Trout [Thu, 11 May 2006 02:15:02 +0000 (02:15 +0000)]
minor tweaks for building mussa under setup.py

18 years agosuper simple mussa gui driver
Diane Trout [Thu, 11 May 2006 02:13:22 +0000 (02:13 +0000)]
super simple mussa gui driver

18 years agobuild all of mussagl as a python extension
Diane Trout [Thu, 11 May 2006 00:17:35 +0000 (00:17 +0000)]
build all of mussagl as a python extension
unfortunately only works on os x so far.

18 years agolets try letting python build mussa
Diane Trout [Wed, 10 May 2006 08:43:58 +0000 (08:43 +0000)]
lets try letting python build mussa
I wonder how distutils will fare building mussa? As I made more progress
getting to interact with the C++ libraries from python than the reverse
I want to see if I can everything to build with just distutils.

18 years agoincrease the use of python in mussa
Diane Trout [Wed, 10 May 2006 01:39:33 +0000 (01:39 +0000)]
increase the use of python in mussa
This patch does let the python extension launch the gui successfully.
I tried to get the C++ gui app to also be able to talk to the python extension
but that didn't work so well. (causes a crash on os x when I statically
link the python extension module in).

18 years agoallow saving aligned window browser to image
Diane Trout [Thu, 4 May 2006 00:58:13 +0000 (00:58 +0000)]
allow saving aligned window browser to image
ticket:70

18 years agoshow the name of the analysis loaded
Diane Trout [Thu, 4 May 2006 00:41:52 +0000 (00:41 +0000)]
show the name of the analysis loaded
ticket:84 put the filename (for gui loaded) or the analysis name
(for command line loaded) names in the mussa window.