"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/Seq.cpp" between
pymol-v2.1.0.tar.bz2 and pymol-open-source-2.2.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

Seq.cpp  (pymol-v2.1.0.tar.bz2)	:	Seq.cpp  (pymol-open-source-2.2.0)
skipping to change at line 297		skipping to change at line 297
{		{
PyMOLGlobals *G = block->G;		PyMOLGlobals *G = block->G;
CSeq *I = G->Seq;		CSeq *I = G->Seq;
if(G->HaveGUI && G->ValidContext) {		if(G->HaveGUI && G->ValidContext) {
int x = I->Block->rect.left;		int x = I->Block->rect.left;
int y = I->Block->rect.bottom + DIP2PIXEL(I->ScrollBarMargin) + 1;		int y = I->Block->rect.bottom + DIP2PIXEL(I->ScrollBarMargin) + 1;
float bg_color[3] = { 0.f, 0.f, 0.f }, overlay_color[3] = { 1.0F, 1.0F, 1.0F };		float bg_color[3] = { 0.f, 0.f, 0.f }, overlay_color[3] = { 1.0F, 1.0F, 1.0F };
int label_color_index = SettingGetGlobal_color(G, cSetting_seq_view_label_co lor);		int label_color_index = SettingGetGlobal_color(G, cSetting_seq_view_label_co lor);
float *label_color = ColorGet(G, label_color_index);		const float *label_color = ColorGet(G, label_color_index);
copy3f(label_color, overlay_color);		copy3f(label_color, overlay_color);
if (SettingGetGlobal_b(G, cSetting_bg_gradient)){		if (SettingGetGlobal_b(G, cSetting_bg_gradient)){
if(SettingGetGlobal_b(G, cSetting_seq_view_location)) {		if(SettingGetGlobal_b(G, cSetting_seq_view_location)) {
copy3f(ColorGet(G, SettingGetGlobal_color(G, cSetting_bg_rgb_bottom)), bg _color);		copy3f(ColorGet(G, SettingGetGlobal_color(G, cSetting_bg_rgb_bottom)), bg _color);
} else {		} else {
copy3f(ColorGet(G, SettingGetGlobal_color(G, cSetting_bg_rgb_top)), bg_co lor);		copy3f(ColorGet(G, SettingGetGlobal_color(G, cSetting_bg_rgb_top)), bg_co lor);
}		}
} else {		} else {
copy3f(ColorGet(G, SettingGetGlobal_color(G, cSetting_bg_rgb)), bg_color);		copy3f(ColorGet(G, SettingGetGlobal_color(G, cSetting_bg_rgb)), bg_color);
skipping to change at line 332		skipping to change at line 332
ScrollBarDoDraw(I->ScrollBar ORTHOCGOARGVAR);		ScrollBarDoDraw(I->ScrollBar ORTHOCGOARGVAR);
y += DIP2PIXEL(I->ScrollBarWidth);		y += DIP2PIXEL(I->ScrollBarWidth);
I->NSkip = (int) ScrollBarGetValue(I->ScrollBar);		I->NSkip = (int) ScrollBarGetValue(I->ScrollBar);
} else {		} else {
I->NSkip = 0;		I->NSkip = 0;
}		}
if(I->NRow) { /* get current sequence sizes */		if(I->NRow) { /* get current sequence sizes */
int a, b;		int a, b;
float black[3] = { 0, 0, 0 };		float black[3] = { 0, 0, 0 };
float blue[3] = { 0.5, 0.5, 1.0 };		float blue[3] = { 0.5, 0.5, 1.0 };
float *cur_color;		const float *cur_color;
CSeqRow *row;		CSeqRow *row;
CSeqCol *col;		CSeqCol *col;
int xx, yy, ch_wid, pix_wid, tot_len;		int xx, yy, ch_wid, pix_wid, tot_len;
int y1 = y;		int y1 = y;
int max_len = 0;		int max_len = 0;
int n_real = 0;		int n_real = 0;
int vis_size = I->VisSize;		int vis_size = I->VisSize;
int first_allowed;		int first_allowed;
int max_title_width = 0;		int max_title_width = 0;
char fill_char;		char fill_char;
const char *fill_str = SettingGetGlobal_s(G, cSetting_seq_view_fill_char);		const char *fill_str = SettingGetGlobal_s(G, cSetting_seq_view_fill_char);
int unaligned_color_index =		int unaligned_color_index =
SettingGetGlobal_color(G, cSetting_seq_view_unaligned_color);		SettingGetGlobal_color(G, cSetting_seq_view_unaligned_color);
int fill_color_index = SettingGetGlobal_color(G, cSetting_seq_view_fill_co lor);		int fill_color_index = SettingGetGlobal_color(G, cSetting_seq_view_fill_co lor);
int unaligned_mode = SettingGetGlobal_i(G, cSetting_seq_view_unaligned_mod e);		int unaligned_mode = SettingGetGlobal_i(G, cSetting_seq_view_unaligned_mod e);
float *unaligned_color;		const float *unaligned_color;
float *fill_color;		const float *fill_color;
if(unaligned_color_index == -1) {		if(unaligned_color_index == -1) {
switch (unaligned_mode) {		switch (unaligned_mode) {
case 3:		case 3:
unaligned_color_index = -1;		unaligned_color_index = -1;
break;		break;
default:		default:
unaligned_color_index = fill_color_index;		unaligned_color_index = fill_color_index;
break;		break;
}		}
skipping to change at line 452		skipping to change at line 452
if(tot_len <= vis_size) {		if(tot_len <= vis_size) {
if(row->label_flag) {		if(row->label_flag) {
TextSetColor(G, cur_color);		TextSetColor(G, cur_color);
if (orthoCGO){		if (orthoCGO){
CGOColorv(orthoCGO, cur_color);		CGOColorv(orthoCGO, cur_color);
} else {		} else {
glColor3fv(cur_color);		glColor3fv(cur_color);
}		}
} else if(col->unaligned && unaligned_color) {		} else if(col->unaligned && unaligned_color) {
float tmp_color[3];		float tmp_color[3];
float *v = ColorGet(G, col->color);		const float *v = ColorGet(G, col->color);
switch (unaligned_mode) {		switch (unaligned_mode) {
case 1:		case 1:
case 4:		case 4:
average3f(v, bg_color, tmp_color);		average3f(v, bg_color, tmp_color);
TextSetColor(G, tmp_color);		TextSetColor(G, tmp_color);
if (orthoCGO){		if (orthoCGO){
CGOColorv(orthoCGO, tmp_color);		CGOColorv(orthoCGO, tmp_color);
} else {		} else {
glColor3fv(tmp_color);		glColor3fv(tmp_color);
}		}
skipping to change at line 484		skipping to change at line 484
default:		default:
TextSetColor(G, unaligned_color);		TextSetColor(G, unaligned_color);
if (orthoCGO){		if (orthoCGO){
CGOColorv(orthoCGO, unaligned_color);		CGOColorv(orthoCGO, unaligned_color);
} else {		} else {
glColor3fv(unaligned_color);		glColor3fv(unaligned_color);
}		}
break;		break;
}		}
} else {		} else {
float *v = ColorGet(G, col->color);		const float *v = ColorGet(G, col->color);
TextSetColor(G, v);		TextSetColor(G, v);
if (orthoCGO){		if (orthoCGO){
CGOColorv(orthoCGO, v);		CGOColorv(orthoCGO, v);
} else {		} else {
glColor3fv(v);		glColor3fv(v);
}		}
}		}
if(col->inverse) {		if(col->inverse) {
if (orthoCGO){		if (orthoCGO){
CGOBegin(orthoCGO, GL_TRIANGLE_STRIP);		CGOBegin(orthoCGO, GL_TRIANGLE_STRIP);
End of changes. 5 change blocks.
6 lines changed or deleted		6 lines changed or added

---