Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zmap
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ensembl-gh-mirror
zmap
Commits
81b1be64
Commit
81b1be64
authored
15 years ago
by
rds
Browse files
Options
Downloads
Patches
Plain Diff
correct the style parser to set all graph details
parent
3d0e3daa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/zmapServer/acedb/acedbServer.c
+16
-7
16 additions, 7 deletions
src/zmapServer/acedb/acedbServer.c
with
16 additions
and
7 deletions
src/zmapServer/acedb/acedbServer.c
+
16
−
7
View file @
81b1be64
...
...
@@ -27,9 +27,9 @@
*
* Exported functions: See zmapServer.h
* HISTORY:
* Last edited: Jun 1
2
1
2:56
2009 (
edgrif
)
* Last edited: Jun 1
8
1
6:19
2009 (
rds
)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
* CVS info: $Id: acedbServer.c,v 1.13
8
2009-06-1
2
1
4:01:14 edgrif
Exp $
* CVS info: $Id: acedbServer.c,v 1.13
9
2009-06-1
8
1
5:26:32 rds
Exp $
*-------------------------------------------------------------------
*/
...
...
@@ -3190,7 +3190,7 @@ ZMapFeatureTypeStyle parseStyle(char *style_str_in,
StyleFeatureColoursStruct
CDS_style_colours
=
{{
NULL
},
{
NULL
}}
;
double
min_score
=
0
.
0
,
max_score
=
0
.
0
;
gboolean
score_by_width
,
score_is_percent
;
gboolean
histogram
=
FALSE
;
gboolean
histogram
=
FALSE
,
score_set
=
FALSE
;
double
histogram_baseline
=
0
.
0
;
gboolean
pfetchable
=
FALSE
;
ZMapStyleBlixemType
blixem_type
=
ZMAPSTYLE_BLIXEM_INVALID
;
...
...
@@ -3578,11 +3578,12 @@ ZMapFeatureTypeStyle parseStyle(char *style_str_in,
char
*
value
;
value
=
strtok_r
(
NULL
,
" "
,
&
line_pos
)
;
score_set
=
TRUE
;
if
(
!
(
status
=
zMapStr2Double
(
value
,
&
min_score
)))
{
zMapLogWarning
(
"Style
\"
%s
\"
: Bad value for
\"
Score_bounds
\"
."
,
name
)
;
score_set
=
FALSE
;
break
;
}
else
...
...
@@ -3592,7 +3593,7 @@ ZMapFeatureTypeStyle parseStyle(char *style_str_in,
if
(
!
(
status
=
zMapStr2Double
(
value
,
&
max_score
)))
{
zMapLogWarning
(
"Style
\"
%s
\"
: Bad value for
\"
Score_bounds
\"
."
,
name
)
;
score_set
=
FALSE
;
break
;
}
}
...
...
@@ -3692,8 +3693,16 @@ ZMapFeatureTypeStyle parseStyle(char *style_str_in,
/* OTHER SCORE STUFF MUST BE SET HERE.... */
if
(
min_score
&&
max_score
)
zMapStyleSetScore
(
style
,
min_score
,
max_score
)
;
/* Note that we require bounds to be set for graphing.... */
if
(
score_set
)
{
ZMapStyleGraphMode
graph_mode
=
ZMAPSTYLE_GRAPH_HISTOGRAM
;
/* HARD CODED! */
if
(
histogram
)
zMapStyleSetGraph
(
style
,
graph_mode
,
min_score
,
max_score
,
histogram_baseline
)
;
else
if
(
min_score
||
max_score
)
zMapStyleSetScore
(
style
,
min_score
,
max_score
)
;
}
if
(
strand_specific
)
zMapStyleSetStrandSpecific
(
style
,
strand_specific
)
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment