mussa.git
18 years agoImageSaveDialog cout removal
Brandon King [Thu, 2 Mar 2006 02:21:28 +0000 (02:21 +0000)]
ImageSaveDialog cout removal

18 years agoImageSaveDialog
Brandon King [Thu, 2 Mar 2006 02:10:26 +0000 (02:10 +0000)]
ImageSaveDialog

18 years agoFirst version of ImageScaler Widget
Brandon King [Wed, 1 Mar 2006 22:53:42 +0000 (22:53 +0000)]
First version of ImageScaler Widget

18 years agoImage File Icon & Lock Icon
Brandon King [Wed, 1 Mar 2006 21:16:41 +0000 (21:16 +0000)]
Image File Icon & Lock Icon

18 years agocleanup nway code
Diane Trout [Wed, 1 Mar 2006 02:44:43 +0000 (02:44 +0000)]
cleanup nway code
Purged the sp_num variable and replaced it with either a .size() call, or
a call to a new member function sequence_count()
Renamed Nway_Paths to NwayPaths
Used vector<>::size_type in a number of places
Reflowed some blocks.

18 years agoline rendering fixes
Diane Trout [Wed, 1 Mar 2006 01:18:23 +0000 (01:18 +0000)]
line rendering fixes
Get the reversed versus forward conservation lines correct. The color is
blue if the orientation of the current vertex differs from the previous
vertex, and red if they have the same oreintation. I also (hopefully)
adjusted the x position so the line points to the center of the conserved
window (adjusting to the right for forward and left for reverse compliment
sequences).

Also we discovered that you can't use both depth testing and alpha blending
at the same time, and so now the selection highlighter is hopefully alpha
blended while all the various lines are depth ordered.

18 years agomove glsequence into "alg" comonent
Diane Trout [Wed, 8 Mar 2006 09:21:38 +0000 (09:21 +0000)]
move glsequence into "alg" comonent
decided to try to make the opengl rendering code toolkit independent
this makes it easier to test some of these components as then I can
just use boost.unittest to verify them.

Also when I python wrap parts it might make sense for the gl components
to be the part that ends up getting exported as the python package.

this is actually a hacked version of the original patch that moves
the test directory a file at a time.

18 years agoshow conservation paths
Diane Trout [Tue, 28 Feb 2006 09:19:32 +0000 (09:19 +0000)]
show conservation paths
This patch draws the windows of conservation between the various sequences.
Getting this to work also required making a number of member functions
properly const.

18 years agofix many mussa_class.cxx warnings
Diane Trout [Tue, 28 Feb 2006 09:17:21 +0000 (09:17 +0000)]
fix many mussa_class.cxx warnings
Got rid of a bunch of signed vs unsigned warning messages by using size_type,
and also put the bodies of a few if or for statements in { }

18 years agoadvance_sp_itor_track was triggering an infinite loop
Diane Trout [Tue, 28 Feb 2006 08:15:51 +0000 (08:15 +0000)]
advance_sp_itor_track was triggering an infinite loop
I somehow missed moving the logic that detected when we'd finished advancing
all the species iterators, which was causing an infinite loop.
I also changed int to vector<>::size_type to get rid of some warnings.

18 years agorender the sequences from the mussa analysis
Diane Trout [Tue, 28 Feb 2006 07:03:09 +0000 (07:03 +0000)]
render the sequences from the mussa analysis
I implemented a GlSequence which attempts to handle the opengl rendering
for a sequence object. Also to make Sequence a bit more consistent
with STL I changed len() to length() and added size() (and changed
the code using it to size()

I added some unit tests for GlSequence as I was not remotely confident
that const_cast was actually the right way to implement the assignment
operator= when one of the member variables is a const reference.

The updateAnalysis code currently is what is handling the layout of the
various sequence objects.

18 years agoprovide an annotation for our example data
Diane Trout [Tue, 28 Feb 2006 06:59:06 +0000 (06:59 +0000)]
provide an annotation for our example data
Admittedly the sample annotation is utterly meaningless.
We should probably go look up some real annotations.

18 years agoAdded WhatsThis feature to Mussa.
Brandon King [Tue, 28 Feb 2006 00:27:37 +0000 (00:27 +0000)]
Added WhatsThis feature to Mussa.

To use this feature, take any QWidget inherited object and call:

widget->setWhatsThis(tr("Long description"));

That's it!

18 years agoCrystal Icons added to repository + Added icons to menu.
Brandon King [Mon, 27 Feb 2006 23:51:36 +0000 (23:51 +0000)]
Crystal Icons added to repository + Added icons to menu.
Crystal SVG Icons are LGPL, comment in README.txt about license.

18 years agoToolbar is now toggleable from menu.
Brandon King [Mon, 27 Feb 2006 22:28:13 +0000 (22:28 +0000)]
Toolbar is now toggleable from menu.

18 years agoAdded icon for motif toggle.
Brandon King [Mon, 27 Feb 2006 21:54:45 +0000 (21:54 +0000)]
Added icon for motif toggle.

18 years agoView Toolbar Action in View Menu.
Brandon King [Mon, 27 Feb 2006 21:53:02 +0000 (21:53 +0000)]
View Toolbar Action in View Menu.

18 years agoput the fake lines at a clipable depth
Diane Trout [Sat, 25 Feb 2006 06:43:48 +0000 (06:43 +0000)]
put the fake lines at a clipable depth
I'm not sure why these precise parameters work, but the slider now
nicely makes my fake lines fade in and out of existence.

18 years agoadd a toolbar with toggle motifs and the base pair threshold
Diane Trout [Sat, 25 Feb 2006 05:31:41 +0000 (05:31 +0000)]
add a toolbar with toggle motifs and the base pair threshold

18 years agoload mupa and show fake path scene
Diane Trout [Sat, 25 Feb 2006 02:52:22 +0000 (02:52 +0000)]
load mupa and show fake path scene
Enable loading a mupa file.
Use the gl scene widget from the qtgl prototype to make it look
like we've done something.

18 years agoreduce warning messages in sequence.cxx
Diane Trout [Sat, 25 Feb 2006 02:47:46 +0000 (02:47 +0000)]
reduce warning messages in sequence.cxx

18 years agotell doxygen to create docs for the qt classes too
Diane Trout [Sat, 25 Feb 2006 01:37:09 +0000 (01:37 +0000)]
tell doxygen to create docs for the qt classes too

18 years agoskeleten of a qt version of mussa
Diane Trout [Sat, 25 Feb 2006 00:41:18 +0000 (00:41 +0000)]
skeleten of a qt version of mussa
One annoying thing about qmake is that each .pro file can only make one
binary. So the old make file which build the fltk gui and more importantly
the boost based unittests is now available as Makefile.noqt.

qmake-qt4 mussagl.pro will generate the qt4 makefile for building the qt4
mussa.

(And I may switch to boost build or scons so I can have one build file
for all the versions).

18 years agorefactor nway_other.cxx
Diane Trout [Fri, 24 Feb 2006 07:17:16 +0000 (07:17 +0000)]
refactor nway_other.cxx
In order to understand how the transitive and radial nway comparisons
worked I wanted to make the algorithms fit in a single window. I did
this by taking various types of initialization loops that were duplicated
between both algortihms and refactored them into seperate functions.
(mostly these common loops handled building paths that were between
our various iterators on each species lists of FLPs)

I thought it might be nice to turn the various functions I ripped out
into a class that manages the march of the iterators across the lists
of FLPs.

I also added some fairly basic unit tests for the nway (transitive) comparison.

18 years agouse exceptions to indicate Mussa::analyze failed
Diane Trout [Fri, 24 Feb 2006 01:08:54 +0000 (01:08 +0000)]
use exceptions to indicate Mussa::analyze failed
also modified the fltk gui code to report the exception text.

18 years agosubanalysis menu option wont crash mussa
Diane Trout [Fri, 24 Feb 2006 00:47:32 +0000 (00:47 +0000)]
subanalysis menu option wont crash mussa

18 years agoonly include headers by names relative to project base path
Diane Trout [Fri, 24 Feb 2006 00:36:01 +0000 (00:36 +0000)]
only include headers by names relative to project base path

18 years agobuild mussa with CXXFLAGS, so I can run gdb.
Diane Trout [Thu, 23 Feb 2006 22:34:34 +0000 (22:34 +0000)]
build mussa with CXXFLAGS, so I can run gdb.

18 years agofixing the number of sequences at setup is silly
Diane Trout [Thu, 23 Feb 2006 06:58:03 +0000 (06:58 +0000)]
fixing the number of sequences at setup is silly
there's little reason to store seq_num as it's just as easily computed
from the size of our sequence vector.

18 years agofix inability to do reverse compliments
Diane Trout [Thu, 23 Feb 2006 06:50:04 +0000 (06:50 +0000)]
fix inability to do reverse compliments
When I added the dynamic allocation of the all_matches vector, I assumed
that seqcomp would only be called once. It turns out that in actuality,
its called twice. Once for the forward compliment and once for the reverse
compliment. This includes a unittest that detects the problem and a fix
for the bug.

18 years agomore thoroughly document FLPs
Diane Trout [Thu, 23 Feb 2006 02:23:23 +0000 (02:23 +0000)]
more thoroughly document FLPs

18 years agouse boost to delete my temp file
Diane Trout [Thu, 23 Feb 2006 02:15:10 +0000 (02:15 +0000)]
use boost to delete my temp file
the unittest now depends on boost/filesystem

18 years agorefactor and test FLPs
Diane Trout [Thu, 23 Feb 2006 02:06:27 +0000 (02:06 +0000)]
refactor and test FLPs
FLPs now dynamically allocate the list of all_matches, which
has the bonus of not needing to pass in the size of the two
sequences that will be seqcomped.
I renamed win_num to size to make it more constent with other container
classes.
Also file_load and file_save were renamed to load and save, again
to be more consistent.
Lastly, I do make sure that I can construct FLPs and save and load them.

18 years agorename mussa_nway to nway_paths
Diane Trout [Wed, 22 Feb 2006 20:16:21 +0000 (20:16 +0000)]
rename mussa_nway to nway_paths

18 years agoi think a binary called unittests is more obvious.
Diane Trout [Wed, 22 Feb 2006 20:14:58 +0000 (20:14 +0000)]
i think a binary called unittests is more obvious.

18 years agorename the_Seqs to the_seqs
Diane Trout [Wed, 22 Feb 2006 20:06:45 +0000 (20:06 +0000)]
rename the_Seqs to the_seqs

18 years agoload a mupa file and test it
Diane Trout [Wed, 22 Feb 2006 08:27:24 +0000 (08:27 +0000)]
load a mupa file and test it
Start trying to isolate ConnWindow from the mussa_class object by using
accessors.
Try to get rid of seq_num and make mussa_class a bit more dynamic,
unfortunately when I killed a bit more in mussa_class than what's gone in
this patch the test cases noticed trying to free an invalid pointer.

18 years agoadd get_analysis_mode_name
Diane Trout [Wed, 22 Feb 2006 07:41:44 +0000 (07:41 +0000)]
add get_analysis_mode_name
get_analysis_mode_name returns a string representation of our analysis
name.
also added some consts to a couple of member functions

18 years agorefactor and test sequence class
Diane Trout [Wed, 22 Feb 2006 07:04:44 +0000 (07:04 +0000)]
refactor and test sequence class

18 years agoput exception definitions in one place and use them
Diane Trout [Wed, 22 Feb 2006 06:42:18 +0000 (06:42 +0000)]
put exception definitions in one place and use them
use exceptions that are derived from runtime_error, and
use them for the cmdline argument parsing and sequence loading

18 years agoalways use all the prequisites when building
Diane Trout [Wed, 22 Feb 2006 04:05:39 +0000 (04:05 +0000)]
always use all the prequisites when building
$? is the prereqs "newer" than the target
$^ is all the prerequisites
Needless to say when building binaries you need all the libraries,
even when they haven't changed.

18 years agoforce doxygen to look at all of our directories
Diane Trout [Wed, 22 Feb 2006 02:20:05 +0000 (02:20 +0000)]
force doxygen to look at all of our directories

18 years agorename some mussa_class members (ana_name to analysis_name)
Diane Trout [Wed, 22 Feb 2006 02:16:42 +0000 (02:16 +0000)]
rename some mussa_class members (ana_name to analysis_name)
also add some getters, reformat the parse_args if/else tree.
Change using character flags for analysis mode to using an enumeration.

18 years agotest mussa class
Diane Trout [Wed, 22 Feb 2006 02:06:03 +0000 (02:06 +0000)]
test mussa class
Also the test case extension should match that of the other source
files.

18 years agounit test skeleton
Diane Trout [Wed, 22 Feb 2006 00:12:57 +0000 (00:12 +0000)]
unit test skeleton
Now we build a unit test binary, though currently there aren't any tests.

18 years agoremove library blessings
Diane Trout [Wed, 22 Feb 2006 00:07:33 +0000 (00:07 +0000)]
remove library blessings

18 years agobreak algorithm out into a subdirectory.
Diane Trout [Tue, 21 Feb 2006 23:51:14 +0000 (23:51 +0000)]
break algorithm out into a subdirectory.

18 years agobuild fltk gui stuff as a library
Diane Trout [Tue, 21 Feb 2006 23:01:44 +0000 (23:01 +0000)]
build fltk gui stuff as a library

18 years agowe also want docs about the fltk gui code
Diane Trout [Tue, 21 Feb 2006 08:45:32 +0000 (08:45 +0000)]
we also want docs about the fltk gui code

18 years agoadd notes of what i learned about seqcomp and nway
Diane Trout [Tue, 21 Feb 2006 08:42:03 +0000 (08:42 +0000)]
add notes of what i learned about seqcomp and nway
stored notes as doxygen comments

18 years agoadd parse error exceptions for the command line args.
Diane Trout [Sat, 4 Feb 2006 18:08:07 +0000 (18:08 +0000)]
add parse error exceptions for the command line args.

18 years agonumber of seqs is more informative than seq num
Diane Trout [Sat, 4 Feb 2006 18:07:25 +0000 (18:07 +0000)]
number of seqs is more informative than seq num

18 years agomassive code move
Diane Trout [Sat, 4 Feb 2006 00:38:24 +0000 (00:38 +0000)]
massive code move
mussa_gui_ was redundant so i moved all of those modules into
gui/
Also I used the non-recursive gnu make style build system.
And lastly there are some Doxygen compatible bits of doucmentation thrown in
here.

18 years agomake headers less interdependent
Diane Trout [Fri, 3 Feb 2006 02:30:04 +0000 (02:30 +0000)]
make headers less interdependent
The mussa headers all depended on including each other to get
all of the right include files. This has been broken and files are more
explicit at including what they depend on.

Also based on Accellerated C++, I followed the convention that header files
should never do a using namespace std, on the off chance that someone
wants to redefine something in the std namespace.

18 years agoremove unnecessary member variable length.
Diane Trout [Thu, 2 Feb 2006 23:16:38 +0000 (23:16 +0000)]
remove unnecessary member variable length.
One should trust the string.length() instead

18 years ago[project @ 16]
Diane Trout [Tue, 27 Sep 2005 19:32:50 +0000 (19:32 +0000)]
[project @ 16]
Build settings for mingw32 (under cygwin)

18 years ago[project @ 15]
Diane Trout [Tue, 27 Sep 2005 00:59:56 +0000 (00:59 +0000)]
[project @ 15]
As mussa is a c++ program switch from using $(CC) to $(CXX) for compilations

18 years ago[project @ 14]
Diane Trout [Thu, 22 Sep 2005 00:46:01 +0000 (00:46 +0000)]
[project @ 14]
Fix save_path_base undefined error. Ticket:1

18 years ago[project @ 13]
Diane Trout [Wed, 21 Sep 2005 23:26:49 +0000 (23:26 +0000)]
[project @ 13]
mussa015

18 years ago[project @ 12]
Diane Trout [Wed, 21 Sep 2005 23:23:41 +0000 (23:23 +0000)]
[project @ 12]
mussa014 example

18 years ago[project @ 11]
Diane Trout [Wed, 21 Sep 2005 23:22:49 +0000 (23:22 +0000)]
[project @ 11]
mussa014

18 years ago[project @ 10]
Diane Trout [Wed, 21 Sep 2005 23:18:36 +0000 (23:18 +0000)]
[project @ 10]
mussa010

18 years ago[project @ 9]
Diane Trout [Wed, 21 Sep 2005 23:17:51 +0000 (23:17 +0000)]
[project @ 9]
mussa009

18 years ago[project @ 8]
Diane Trout [Wed, 21 Sep 2005 23:16:55 +0000 (23:16 +0000)]
[project @ 8]
mussa_008

18 years ago[project @ 7]
Diane Trout [Wed, 21 Sep 2005 23:14:15 +0000 (23:14 +0000)]
[project @ 7]
mussa_pre.7

18 years ago[project @ 6]
Diane Trout [Fri, 16 Sep 2005 23:08:29 +0000 (23:08 +0000)]
[project @ 6]
musssa_pre.5

18 years ago[project @ 5]
Diane Trout [Fri, 16 Sep 2005 22:49:56 +0000 (22:49 +0000)]
[project @ 5]
mussa_pre.4.tar.gz

18 years ago[project @ 4]
Diane Trout [Fri, 16 Sep 2005 22:45:17 +0000 (22:45 +0000)]
[project @ 4]
mussa_pI.3

18 years ago[project @ 3]
Diane Trout [Fri, 16 Sep 2005 22:43:01 +0000 (22:43 +0000)]
[project @ 3]
checked in mussa_pI.2

18 years ago[project @ 2]
Diane Trout [Fri, 16 Sep 2005 22:41:59 +0000 (22:41 +0000)]
[project @ 2]
Checked in mussa_pI.1