Rename GuiDrawSpiralSegment to GuiSetSpiralSegmentColor
This commit is contained in:
committed by
Stéphane Lesimple
parent
956131c3f3
commit
bb6c9222fb
@@ -1543,10 +1543,10 @@ void GuiFreeSpiral(Spiral*);
|
|||||||
|
|
||||||
void GuiFillSpiral(Spiral*, GdkColor*);
|
void GuiFillSpiral(Spiral*, GdkColor*);
|
||||||
void GuiDrawSpiral(Spiral*);
|
void GuiDrawSpiral(Spiral*);
|
||||||
void GuiDrawSpiralSegment(Spiral*, GdkColor*, GdkColor*, int);
|
|
||||||
void GuiDrawSpiralLabel(Spiral*, PangoLayout*, char*, GdkColor*, int, int);
|
void GuiDrawSpiralLabel(Spiral*, PangoLayout*, char*, GdkColor*, int, int);
|
||||||
void GuiChangeSpiralCursor(Spiral*, int);
|
void GuiChangeSpiralCursor(Spiral*, int);
|
||||||
void GuiMoveSpiralCursor(Spiral*, int);
|
void GuiMoveSpiralCursor(Spiral*, int);
|
||||||
|
void GuiSetSpiralSegmentColor(Spiral*, GdkColor*, GdkColor*, int);
|
||||||
#else
|
#else
|
||||||
#define GuiChangeSpiralCursor(a, b)
|
#define GuiChangeSpiralCursor(a, b)
|
||||||
#define GuiFreeSpiral(s)
|
#define GuiFreeSpiral(s)
|
||||||
|
|||||||
@@ -195,14 +195,14 @@ static gboolean clip_idle_func(gpointer data)
|
|||||||
spiral->segmentClipping = spiral->segmentCount;
|
spiral->segmentClipping = spiral->segmentCount;
|
||||||
|
|
||||||
for(i=clipping; i < spiral->segmentCount; i++)
|
for(i=clipping; i < spiral->segmentCount; i++)
|
||||||
GuiDrawSpiralSegment(spiral, Closure->background, Closure->background, i);
|
GuiSetSpiralSegmentColor(spiral, Closure->background, Closure->background, i);
|
||||||
|
|
||||||
spiral->segmentClipping = clipping;
|
spiral->segmentClipping = clipping;
|
||||||
|
|
||||||
/* Now redraw the last turn */
|
/* Now redraw the last turn */
|
||||||
|
|
||||||
for(i=ADAPTIVE_READ_SPIRAL_SIZE-300; i<=clipping; i++)
|
for(i=ADAPTIVE_READ_SPIRAL_SIZE-300; i<=clipping; i++)
|
||||||
GuiDrawSpiralSegment(spiral, Closure->background, 0, i);
|
GuiSetSpiralSegmentColor(spiral, Closure->background, 0, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -243,7 +243,7 @@ static gboolean remove_fill_idle_func(gpointer data)
|
|||||||
|
|
||||||
for(i=0; i<spiral->segmentCount; i++)
|
for(i=0; i<spiral->segmentCount; i++)
|
||||||
if(spiral->segmentColor[i] == Closure->whiteSector)
|
if(spiral->segmentColor[i] == Closure->whiteSector)
|
||||||
GuiDrawSpiralSegment(spiral, Closure->background, 0, i);
|
GuiSetSpiralSegmentColor(spiral, Closure->background, 0, i);
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,15 +112,15 @@ static gboolean curve_idle_func(gpointer data)
|
|||||||
gtk_label_set_text(GTK_LABEL(Closure->readLinearErrors), utf);
|
gtk_label_set_text(GTK_LABEL(Closure->readLinearErrors), utf);
|
||||||
g_free(utf);
|
g_free(utf);
|
||||||
|
|
||||||
/*** Draw the changed spiral segments */
|
/*** Update color of the changed spiral segments */
|
||||||
|
|
||||||
for(i=rc->lastSegment; i<ci->percent; i++)
|
for(i=rc->lastSegment; i<ci->percent; i++)
|
||||||
switch(Closure->readLinearCurve->ivalue[i])
|
switch(Closure->readLinearCurve->ivalue[i])
|
||||||
{ case 0: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->blueSector, 0, i); break;
|
{ case 0: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->blueSector, 0, i); break;
|
||||||
case 1: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->greenSector, 0, i); break;
|
case 1: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->greenSector, 0, i); break;
|
||||||
case 2: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->redSector, 0, i); break;
|
case 2: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->redSector, 0, i); break;
|
||||||
case 3: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->darkSector, 0, i); break;
|
case 3: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->darkSector, 0, i); break;
|
||||||
case 4: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->yellowSector, 0, i); break;
|
case 4: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->yellowSector, 0, i); break;
|
||||||
}
|
}
|
||||||
|
|
||||||
rc->lastSegment = ci->percent;
|
rc->lastSegment = ci->percent;
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ static gboolean spiral_idle_func(gpointer data)
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
for(i=sii->from; i<=sii->to; i++)
|
for(i=sii->from; i<=sii->to; i++)
|
||||||
GuiDrawSpiralSegment(sii->cmpSpiral, sii->segColor, 0, i-1);
|
GuiSetSpiralSegmentColor(sii->cmpSpiral, sii->segColor, 0, i-1);
|
||||||
|
|
||||||
g_free(sii);
|
g_free(sii);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ static gboolean spiral_idle_func(gpointer data)
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
for(i=sii->from; i<=sii->to; i++)
|
for(i=sii->from; i<=sii->to; i++)
|
||||||
GuiDrawSpiralSegment(sii->cmpSpiral, sii->segColor, 0, i-1);
|
GuiSetSpiralSegmentColor(sii->cmpSpiral, sii->segColor, 0, i-1);
|
||||||
|
|
||||||
g_free(sii);
|
g_free(sii);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ static gboolean spiral_idle_func(gpointer data)
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
for(i=sii->from; i<=sii->to; i++)
|
for(i=sii->from; i<=sii->to; i++)
|
||||||
GuiDrawSpiralSegment(sii->cmpSpiral, sii->segColor, 0, i-1);
|
GuiSetSpiralSegmentColor(sii->cmpSpiral, sii->segColor, 0, i-1);
|
||||||
|
|
||||||
g_free(sii);
|
g_free(sii);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ void GuiDrawSpiral(Spiral *spiral)
|
|||||||
* Draw just one segment of the spiral
|
* Draw just one segment of the spiral
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void GuiDrawSpiralSegment(Spiral *spiral, GdkColor *color, GdkColor *outline, int segment)
|
void GuiSetSpiralSegmentColor(Spiral *spiral, GdkColor *color, GdkColor *outline, int segment)
|
||||||
{
|
{
|
||||||
if(segment<0 || segment>=spiral->segmentClipping)
|
if(segment<0 || segment>=spiral->segmentClipping)
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user