Skip to content

P
proview
Commit 5b10481c authored by claes's avatar claes
Browse files
Options

x-axis adjusted to time interval

parent 28ad85a4
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 40 deletions
xtt/lib/ge/src/ge_curve.cpp
View file @ 5b10481c
/*
* Proview $Id: ge_curve.cpp,v 1.6 2005-10-21 16:11:22 claes Exp $
* Proview $Id: ge_curve.cpp,v 1.7 2005-11-14 16:18:32 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -237,7 +237,8 @@ static void gec_activate_minmax_ok( Widget w, GeCurve *curve, XmAnyCallbackStruc
curve->cd->scale( curve->cd->axis_type[i], curve->cd->value_type[i],
min_value, max_value,
&curve->cd->min_value_axis[i], &curve->cd->max_value_axis[i],
&curve->cd->lines[i], curve->cd->format[i],
&curve->cd->trend_lines[i], &curve->cd->axis_lines[i], &curve->cd->axis_linelongq[i],
&curve->cd->axis_valueq[i], curve->cd->format[i],
&curve->cd->axis_width[i], 1, 1);
......@@ -327,11 +328,11 @@ static int ge_growaxis_cb( GlowCtx *ctx, glow_tEvent event)
for ( int i = 0; i < curve->cd->cols; i++) {
if ( event->object.object == curve->axis_object[i]) {
grow_SetTrendLines( curve->curve_object,
curve->cd->lines[0] - 2,
2 * curve->cd->lines[i] - 3);
curve->cd->trend_lines[0] - 2,
2 * curve->cd->trend_lines[i] - 3);
grow_Redraw( curve->growcurve_ctx);
grow_SetAxisConf( curve->axis_lineobject, 0, 10,
2 * curve->cd->lines[i] - 1, 1, 10, 0, "%2.0f");
2 * curve->cd->trend_lines[i] - 1, 1, 10, 0, "%2.0f");
grow_Redraw( curve->growaxis_ctx);
break;
}
......@@ -607,7 +608,7 @@ int GeCurve::configure_axes()
glow_eDrawType_TextHelvetica, NULL,
&axis_lineobject);
grow_SetAxisConf( axis_lineobject, 0, 10,
2 * cd->lines[idx] - 1, 1, 10, 0, "%1.0f");
2 * cd->trend_lines[idx] - 1, 1, 10, 0, "%1.0f");
x = 0;
for ( i = 1; i < cd->cols; i++) {
......@@ -621,7 +622,7 @@ int GeCurve::configure_axes()
grow_SetAxisConf( axis_object[i], cd->max_value_axis[i],
cd->min_value_axis[i],
2 * cd->lines[i] - 1, 2, 2, 0, cd->format[i]);
2 * cd->trend_lines[i] - 1, 2, 2, 0, cd->format[i]);
x += cd->axis_width[i];
}
}
......@@ -697,8 +698,8 @@ int GeCurve::configure_curves()
grow_SetTrendLines( curve_object,
// int(cd->max_value_axis[0] - cd->min_value_axis[0] - 1),
cd->lines[0] - 2,
2 * cd->lines[idx] - 3);
cd->trend_lines[0] - 2,
2 * cd->trend_lines[idx] - 3);
if ( cd->x_reverse) {
minval = cd->max_value_axis[0];
......@@ -711,8 +712,8 @@ int GeCurve::configure_curves()
grow_SetAxisConf( curve_axisobject, minval, maxval,
// 10 * int( cd->max_value_axis[0] - cd->min_value_axis[0]) + 1,
cd->lines[0] * 2 - 1,
2, 2, 270, cd->format[0]);
cd->axis_lines[0],
cd->axis_linelongq[0], cd->axis_valueq[0], 270, cd->format[0]);
grow_CurveConfigure( curve_object, &gcd);
......@@ -1044,7 +1045,11 @@ GeCurveData::GeCurveData( curve_eDataType datatype) :
min_value[i] = 0;
min_value_axis[i] = 0;
max_value_axis[i] = 0;
lines[i] = 0;
trend_lines[i] = 0;
axis_lines[i] = 0;
axis_linelongq[i] = 0;
axis_valueq[i] = 0;
axis_width[i] = 0;
}
}
......@@ -1083,7 +1088,8 @@ void GeCurveData::get_default_axis()
for ( int i = 0; i < cols; i++) {
scale( axis_type[i], value_type[i], min_value[i], max_value[i],
&min_value_axis[i], &max_value_axis[i], &lines[i], format[i],
&min_value_axis[i], &max_value_axis[i], &trend_lines[i], &axis_lines[i],
&axis_linelongq[i], &axis_valueq[i], format[i],
&axis_width[i], 0, 0);
}
}
......@@ -1205,8 +1211,8 @@ void GeCurveData::select_color( bool dark_bg)
void GeCurveData::scale( int axis_type, int value_type,
double min_value, double max_value,
double *min_value_axis, double *max_value_axis,
int *lines, char *format,
double *axis_width, int not_zero, int allow_odd)
int *trend_lines, int *axis_lines, int *axis_linelongq, int *axis_valueq,
char *format, double *axis_width, int not_zero, int allow_odd)
{
double value, maxval, minval;
int i_value;
......@@ -1214,6 +1220,10 @@ void GeCurveData::scale( int axis_type, int value_type,
int min_lines, max_lines;
int min_zero, max_zero;
int format_int, format_dec;
int format_type = 0;
int trendlinequot = 2;
int axlinequot = 2;
int axvaluequot = 2;
// Scale 0 - 10 for boolean
if ( value_type == pwr_eType_Boolean) {
......@@ -1253,7 +1263,7 @@ void GeCurveData::scale( int axis_type, int value_type,
minval = i_value;
min_lines = abs(i_value) / 10;
}
else {
else if ( max_value - min_value < 10000) {
i_value = int(max_value/100) * 100 + 100;
maxval = i_value;
max_lines = i_value / 100;
......@@ -1265,6 +1275,67 @@ void GeCurveData::scale( int axis_type, int value_type,
minval = i_value;
min_lines = abs(i_value) / 100;
}
else if ( max_value - min_value < 30000) {
i_value = int(max_value/600) * 600 + 600;
maxval = i_value;
max_lines = i_value / 60;
if ( fabs( min_value) < DBL_EPSILON)
i_value = 0;
else
i_value = int(min_value/60) * 60 - 60;
minval = i_value;
min_lines = abs(i_value) / 60;
format_type = 1;
trendlinequot = 2;
axlinequot = 10;
axvaluequot = 10;
}
else if ( max_value - min_value < 60000) {
i_value = int(max_value/600) * 600 + 600;
maxval = i_value;
max_lines = i_value / 600;
if ( fabs( min_value) < DBL_EPSILON)
i_value = 0;
else
i_value = int(min_value/600) * 600 - 600;
minval = i_value;
min_lines = abs(i_value) / 600;
axlinequot = 6;
axvaluequot = 2;
format_type = 1;
}
else if ( max_value - min_value < 140000) {
i_value = int(max_value/600) * 600 + 600;
maxval = i_value;
max_lines = i_value / 600;
if ( fabs( min_value) < DBL_EPSILON)
i_value = 0;
else
i_value = int(min_value/600) * 600 - 600;
minval = i_value;
min_lines = abs(i_value) / 600;
axlinequot = 6;
axvaluequot = 12;
format_type = 1;
}
else {
i_value = int(max_value/600) * 3600 + 3600;
maxval = i_value;
max_lines = i_value / 3600;
if ( fabs( min_value) < DBL_EPSILON)
i_value = 0;
else
i_value = int(min_value/3600) * 3600 - 3600;
minval = i_value;
min_lines = abs(i_value) / 3600;
axlinequot = 2;
axvaluequot = 2;
format_type = 2;
}
}
else {
min_zero = 0;
......@@ -1383,24 +1454,41 @@ void GeCurveData::scale( int axis_type, int value_type,
}
*max_value_axis = maxval;
*min_value_axis = minval;
*lines = max_lines + min_lines + 1;
format_int = abs(n) + 1;
if ( n > 0)
format_dec = 0;
else {
format_dec = abs(n);
format_int++;
*trend_lines = max_lines + min_lines + 1;
*axis_lines = (*trend_lines - 1) * trendlinequot + 1;
*axis_linelongq = axlinequot;
*axis_valueq = axvaluequot;
switch ( format_type) {
case 0:
// Float format
format_int = abs(n) + 1;
if ( n > 0)
format_dec = 0;
else {
format_dec = abs(n);
format_int++;
}
if ( minval < 0)
format_int++;
sprintf( format, "%%%d.%df", format_int, format_dec);
*axis_width = 0.65 * format_int + 0.4;
break;
case 1:
// Hour and minute format
strcpy( format, "%2t");
*axis_width = 0.65 * format_int + 0.4;
break;
case 2:
// Days and hour format
strcpy( format, "%3t");
*axis_width = 0.65 * format_int + 0.4;
break;
}
if ( minval < 0)
format_int++;
sprintf( format, "%%%d.%df", format_int, format_dec);
*axis_width = 0.65 * format_int + 0.4;
printf( "%f %f %f %f %3d %5s %4.1f\n",
min_value, max_value,
*min_value_axis, *max_value_axis, *lines, format, *axis_width);
*min_value_axis, *max_value_axis, *trend_lines, format, *axis_width);
return;
}
xtt/lib/ge/src/ge_curve.h
View file @ 5b10481c
/*
* Proview $Id: ge_curve.h,v 1.5 2005-10-21 16:11:22 claes Exp $
* Proview $Id: ge_curve.h,v 1.6 2005-11-14 16:18:32 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -62,7 +62,10 @@ class GeCurveData {
double min_value[CURVE_MAX_COLS];
double max_value_axis[CURVE_MAX_COLS];
double min_value_axis[CURVE_MAX_COLS];
int lines[CURVE_MAX_COLS];
int trend_lines[CURVE_MAX_COLS];
int axis_lines[CURVE_MAX_COLS];
int axis_linelongq[CURVE_MAX_COLS];
int axis_valueq[CURVE_MAX_COLS];
glow_eDrawType color[CURVE_MAX_COLS];
glow_eDrawType fillcolor[CURVE_MAX_COLS];
glow_eDrawType axiscolor[CURVE_MAX_COLS];
......@@ -77,7 +80,8 @@ class GeCurveData {
void scale( int axis_type, int value_type,
double min_value, double max_value,
double *min_value_axis, double *max_value_axis,
int *lines, char *format,
int *trend_lines, int *axis_lines, int *axis_linelongq,
int *axis_valueq,char *format,
double *axis_width, int not_zero, int allow_odd);
~GeCurveData();
};
......
xtt/lib/xtt/src/xtt_fast.cpp
View file @ 5b10481c
/*
* Proview $Id: xtt_fast.cpp,v 1.4 2005-10-25 15:28:10 claes Exp $
* Proview $Id: xtt_fast.cpp,v 1.5 2005-11-14 16:15:02 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -182,8 +182,8 @@ XttFast::XttFast(
gcd->scale( gcd->axis_type[j], gcd->value_type[j],
fp.YMinValue[i], fp.YMaxValue[i],
&gcd->min_value_axis[j], &gcd->max_value_axis[j],
&gcd->lines[j], gcd->format[j],
&gcd->axis_width[j], 1, 1);
&gcd->trend_lines[j], &gcd->axis_lines[j], &gcd->axis_linelongq[j],
&gcd->axis_valueq[j], gcd->format[j], &gcd->axis_width[j], 1, 1);
else
axis_configured = false;
}
......@@ -422,7 +422,9 @@ void fast_scan( XttFast *fast)
fast->gcd->scale( fast->gcd->axis_type[0], fast->gcd->value_type[0],
fast->gcd->min_value[0], fast->gcd->max_value[0],
&fast->gcd->min_value_axis[0], &fast->gcd->max_value_axis[0],
&fast->gcd->lines[0], fast->gcd->format[0],
&fast->gcd->trend_lines[0], &fast->gcd->axis_lines[0],
&fast->gcd->axis_linelongq[0],
&fast->gcd->axis_valueq[0], fast->gcd->format[0],
&fast->gcd->axis_width[0], 1, 1);
if ( !fast->first_scan) {
fast->curve->configure_curves();
......
xtt/lib/xtt/src/xtt_trend.cpp
View file @ 5b10481c
/*
* Proview $Id: xtt_trend.cpp,v 1.5 2005-10-21 16:11:22 claes Exp $
* Proview $Id: xtt_trend.cpp,v 1.6 2005-11-14 16:14:55 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -260,7 +260,8 @@ XttTrend::XttTrend(
gcd->scale( gcd->axis_type[i+1], gcd->value_type[i+1],
plot.YMinValue[i], plot.YMaxValue[i],
&gcd->min_value_axis[i+1], &gcd->max_value_axis[i+1],
&gcd->lines[i+1], gcd->format[i+1],
&gcd->trend_lines[i+1], &gcd->axis_lines[i+1], &gcd->axis_linelongq[i+1],
&gcd->axis_valueq[i+1], gcd->format[i+1],
&gcd->axis_width[i+1], 1, 1);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7