Skip to content

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

Spelling correction

parent 7322ec58
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 67 deletions
src/exe/co_convert/src/cnv_topdf.cpp
View file @ 5c94b4ff
/*
* Proview $Id: cnv_topdf.cpp,v 1.5 2007-09-25 13:07:33 claes Exp $
* Proview $Id: cnv_topdf.cpp,v 1.6 2008-10-16 11:07:17 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -455,35 +455,35 @@ void CnvToPdf::draw_rect( double lw, double x, double y, double w, double h)
}
void CnvToPdf::draw_arc( double lw, double x, double y, double w, double h,
int angel1, int angel2)
int angle1, int angle2)
{
fp[cf] <<
" " << lw << " w" << endl;
if ( (angel1 == 0 && angel2 >= 90) ||
(angel1 == 90 && angel2 >= 360) ||
(angel1 == 180 && angel2 >= 270) ||
(angel1 == 270 && angel2 >= 180))
if ( (angle1 == 0 && angle2 >= 90) ||
(angle1 == 90 && angle2 >= 360) ||
(angle1 == 180 && angle2 >= 270) ||
(angle1 == 270 && angle2 >= 180))
fp[cf] <<
" " << x + w << " " << y + h/2 << " m" <<
" " << x + w << " " << y + h << " " << x + w << " " << y + h << " " << x + w/2 << " " << y + h << " " << " c" << endl;
if ( (angel1 == 0 && angel2 >= 180) ||
(angel1 == 90 && angel2 >= 90) ||
(angel1 == 180 && angel2 >= 360) ||
(angel1 == 270 && angel2 >= 270))
if ( (angle1 == 0 && angle2 >= 180) ||
(angle1 == 90 && angle2 >= 90) ||
(angle1 == 180 && angle2 >= 360) ||
(angle1 == 270 && angle2 >= 270))
fp[cf] <<
" " << x + w/2 << " " << y + h << " m" <<
" " << x << " " << y + h << " " << x << " " << y + h << " " << x << " " << y + h/2 << " " << " c" << endl;
if ( (angel1 == 0 && angel2 >= 270) ||
(angel1 == 90 && angel2 >= 180) ||
(angel1 == 180 && angel2 >= 90) ||
(angel1 == 270 && angel2 >= 360))
if ( (angle1 == 0 && angle2 >= 270) ||
(angle1 == 90 && angle2 >= 180) ||
(angle1 == 180 && angle2 >= 90) ||
(angle1 == 270 && angle2 >= 360))
fp[cf] <<
" " << x << " " << y + h/2 << " m" <<
" " << x << " " << y << " " << x << " " << y << " " << x + w/2 << " " << y << " " << " c" << endl;
if ( (angel1 == 0 && angel2 >= 360) ||
(angel1 == 90 && angel2 >= 270) ||
(angel1 == 180 && angel2 >= 180) ||
(angel1 == 270 && angel2 >= 90))
if ( (angle1 == 0 && angle2 >= 360) ||
(angle1 == 90 && angle2 >= 270) ||
(angle1 == 180 && angle2 >= 180) ||
(angle1 == 270 && angle2 >= 90))
fp[cf] <<
" " << x + w/2 << " " << y << " m" <<
" " << x + w << " " << y << " " << x + w << " " << y << " " << x + w << " " << y + h/2 << " " << " c" << endl;
......
src/exe/co_convert/src/cnv_topdf.h
View file @ 5c94b4ff
/*
* Proview $Id: cnv_topdf.h,v 1.4 2007-09-25 13:07:33 claes Exp $
* Proview $Id: cnv_topdf.h,v 1.5 2008-10-16 11:07:17 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -176,7 +176,7 @@ class CnvToPdf {
void print_text( char *text, CnvStyle& style, int mode = pdf_mPrintMode_Pos);
void draw_rect( double lw, double x, double y, double w, double h);
void draw_arc( double lw, double x, double y, double w, double h,
int angel1, int angel2);
int angle1, int angle2);
void draw_line( double lw, double x1, double y1, double x2, double y2,
int dashed, int gray);
void draw_text( double x, double y, char *text, int bold, double size);
......
src/exe/co_convert/src/cnv_wbltoh.cpp
View file @ 5c94b4ff
/*
* Proview $Id: cnv_wbltoh.cpp,v 1.12 2008-06-24 06:53:51 claes Exp $
* Proview $Id: cnv_wbltoh.cpp,v 1.13 2008-10-16 11:07:17 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -876,6 +876,7 @@ int CnvWblToH::cixstr_to_classid( char *cix_str, pwr_tClassId *cid)
{ "pwr_eCix_DynamicVolume", pwr_eCix_DynamicVolume},
{ "pwr_eCix_SystemVolume", pwr_eCix_SystemVolume},
{ "pwr_eCix_ClassVolume", pwr_eCix_ClassVolume},
{ "pwr_eCix_DetachedClassVolume", pwr_eCix_DetachedClassVolume},
{ "pwr_eCix_WorkBenchVolume", pwr_eCix_WorkBenchVolume},
{ "pwr_eCix_DirectoryVolume", pwr_eCix_DirectoryVolume},
{ "pwr_eCix_CreateVolume", pwr_eCix_CreateVolume},
......
xtt/lib/flow/motif/flow_draw_xlib.cpp
View file @ 5c94b4ff
/*
* Proview $Id: flow_draw_xlib.cpp,v 1.3 2007-05-22 08:17:11 claes Exp $
* Proview $Id: flow_draw_xlib.cpp,v 1.4 2008-10-16 11:05:15 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -1025,7 +1025,7 @@ int FlowDrawXLib::nav_arrow_erase( FlowCtx *ctx, int x1, int y1, int x2, int y2,
}
int FlowDrawXLib::arc( FlowCtx *ctx, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
flow_eDrawType gc_type, int idx, int highlight)
{
if ( ctx->nodraw) return 1;
......@@ -1035,24 +1035,24 @@ int FlowDrawXLib::arc( FlowCtx *ctx, int x, int y, int width, int height,
XDrawArc( display, window,
gcs[gc_type+highlight][idx],
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
return 1;
}
int FlowDrawXLib::arc_erase( FlowCtx *ctx, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
int idx)
{
if ( ctx->nodraw) return 1;
XDrawArc( display, window,
gcs[flow_eDrawType_LineErase][idx],
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
return 1;
}
int FlowDrawXLib::nav_arc( FlowCtx *ctx, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
flow_eDrawType gc_type, int idx, int highlight)
{
if ( ctx->no_nav || ctx->nodraw) return 1;
......@@ -1062,19 +1062,19 @@ int FlowDrawXLib::nav_arc( FlowCtx *ctx, int x, int y, int width, int height,
XDrawArc( display, nav_window,
gcs[gc_type+highlight][idx],
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
return 1;
}
int FlowDrawXLib::nav_arc_erase( FlowCtx *ctx, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
int idx)
{
if ( ctx->no_nav || ctx->nodraw) return 1;
XDrawArc( display, nav_window,
gcs[flow_eDrawType_LineErase][idx],
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
return 1;
}
......
xtt/lib/flow/motif/flow_draw_xlib.h
View file @ 5c94b4ff
/*
* Proview $Id: flow_draw_xlib.h,v 1.2 2007-05-11 15:07:21 claes Exp $
* Proview $Id: flow_draw_xlib.h,v 1.3 2008-10-16 11:05:15 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -114,16 +114,16 @@ class FlowDrawXLib : public FlowDraw {
int x3, int y3,
int idx);
int arc( FlowCtx *ctx, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
flow_eDrawType gc_type, int idx, int highlight);
int arc_erase( FlowCtx *ctx, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
int idx);
int nav_arc( FlowCtx *ctx, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
flow_eDrawType gc_type, int idx, int highlight);
int nav_arc_erase( FlowCtx *ctx, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
int idx);
int line( FlowCtx *ctx, int x1, int y1, int x2, int y2,
flow_eDrawType gc_type, int idx, int highlight);
......
xtt/lib/flow/src/flow_print.h
View file @ 5c94b4ff
/*
* Proview $Id: flow_print.h,v 1.1 2007-09-25 13:11:00 claes Exp $
* Proview $Id: flow_print.h,v 1.2 2008-10-16 11:05:15 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -31,7 +31,7 @@ class FlowPrint {
virtual int print_page( double ll_x, double ll_y, double ur_x, double ur_y) {return 1;}
virtual int rect( double x, double y, double width, double height, flow_eDrawType type, double idx, int highlight) { return 1;}
virtual int filled_rect( double x, double y, double width, double height, flow_eDrawType type, double idx) {return 1;}
virtual int arc( double x, double y, double width, double height, int angel1, int angel2,
virtual int arc( double x, double y, double width, double height, int angle1, int angle2,
flow_eDrawType type, double idx, int highlight) {return 1;}
virtual int line( double x1, double y1, double x2, double y2, flow_eDrawType type, double idx, int highlight) {return 1;}
virtual int text( double x, double y, char *text, int len, flow_eDrawType type, double size) {return 1;}
......
xtt/lib/glow/motif/glow_draw_xlib.cpp
View file @ 5c94b4ff
/*
* Proview $Id: glow_draw_xlib.cpp,v 1.8 2007-08-20 08:32:54 claes Exp $
* Proview $Id: glow_draw_xlib.cpp,v 1.9 2008-10-16 11:05:15 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -1309,7 +1309,7 @@ int GlowDrawXLib::arrow_erase( GlowWind *wind, int x1, int y1, int x2, int y2,
}
int GlowDrawXLib::arc( GlowWind *wind, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
glow_eDrawType gc_type, int idx, int highlight)
{
if ( ctx->nodraw) return 1;
......@@ -1324,10 +1324,10 @@ int GlowDrawXLib::arc( GlowWind *wind, int x, int y, int width, int height,
// if ( width < 35 && height < 35) {width++; height++;} // This looks good in Reflexion X ...
if ( angel1 >= 360)
angel1 = angel1 - angel1 / 360 * 360;
else if ( angel1 < 0)
angel1 = angel1 + ( -angel1 / 360 + 1) * 360;
if ( angle1 >= 360)
angle1 = angle1 - angle1 / 360 * 360;
else if ( angle1 < 0)
angle1 = angle1 + ( -angle1 / 360 + 1) * 360;
if ( w->clip_on)
set_clip( w, get_gc( this, gc_type+highlight, idx));
......@@ -1335,12 +1335,12 @@ int GlowDrawXLib::arc( GlowWind *wind, int x, int y, int width, int height,
if ( !w->draw_buffer_only)
XDrawArc( display, w->window,
get_gc( this, gc_type+highlight, idx),
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
if ( w->double_buffer_on)
XDrawArc( display, w->buffer,
get_gc( this, gc_type+highlight, idx),
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
if ( w->clip_on)
reset_clip( w, get_gc( this, gc_type+highlight, idx));
......@@ -1349,7 +1349,7 @@ int GlowDrawXLib::arc( GlowWind *wind, int x, int y, int width, int height,
}
int GlowDrawXLib::fill_arc( GlowWind *wind, int x, int y, int width, int height,
int angel1, int angel2, glow_eDrawType gc_type, int highlight)
int angle1, int angle2, glow_eDrawType gc_type, int highlight)
{
if ( ctx->nodraw) return 1;
DrawWindXLib *w = (DrawWindXLib *) wind->window;
......@@ -1357,10 +1357,10 @@ int GlowDrawXLib::fill_arc( GlowWind *wind, int x, int y, int width, int height,
if ( gc_type == glow_eDrawType_LineGray && highlight)
gc_type = glow_eDrawType_LineRed;
if ( angel1 >= 360)
angel1 = angel1 - angel1 / 360 * 360;
else if ( angel1 < 0)
angel1 = angel1 + ( -angel1 / 360 + 1) * 360;
if ( angle1 >= 360)
angle1 = angle1 - angle1 / 360 * 360;
else if ( angle1 < 0)
angle1 = angle1 + ( -angle1 / 360 + 1) * 360;
if ( w->clip_on)
set_clip( w, get_gc( this, gc_type+highlight, 0));
......@@ -1368,11 +1368,11 @@ int GlowDrawXLib::fill_arc( GlowWind *wind, int x, int y, int width, int height,
if ( !w->draw_buffer_only)
XFillArc( display, w->window,
get_gc( this, gc_type+highlight, 0),
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
if ( w->double_buffer_on)
XFillArc( display, w->buffer,
get_gc( this, gc_type+highlight, 0),
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
if ( w->clip_on)
reset_clip( w, get_gc( this, gc_type+highlight, 0));
......@@ -1381,7 +1381,7 @@ int GlowDrawXLib::fill_arc( GlowWind *wind, int x, int y, int width, int height,
}
int GlowDrawXLib::arc_erase( GlowWind *wind, int x, int y, int width, int height,
int angel1, int angel2,
int angle1, int angle2,
int idx)
{
if ( ctx->nodraw) return 1;
......@@ -1389,10 +1389,10 @@ int GlowDrawXLib::arc_erase( GlowWind *wind, int x, int y, int width, int height
// if ( width < 35 && height < 35) {width++; height++;} // This looks good in Reflexion X ...
if ( angel1 >= 360)
angel1 = angel1 - angel1 / 360 * 360;
else if ( angel1 < 0)
angel1 = angel1 + ( -angel1 / 360 + 1) * 360;
if ( angle1 >= 360)
angle1 = angle1 - angle1 / 360 * 360;
else if ( angle1 < 0)
angle1 = angle1 + ( -angle1 / 360 + 1) * 360;
if ( w->clip_on)
set_clip( w, get_gc( this, glow_eDrawType_LineErase, idx));
......@@ -1400,11 +1400,11 @@ int GlowDrawXLib::arc_erase( GlowWind *wind, int x, int y, int width, int height
if ( !w->draw_buffer_only)
XDrawArc( display, w->window,
get_gc( this, glow_eDrawType_LineErase, idx),
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
if ( w->double_buffer_on)
XDrawArc( display, w->buffer,
get_gc( this, glow_eDrawType_LineErase, idx),
x, y, width, height, angel1*64, angel2*64);
x, y, width, height, angle1*64, angle2*64);
if ( w->clip_on)
reset_clip( w, get_gc( this, glow_eDrawType_LineErase, idx));
......@@ -2721,7 +2721,7 @@ int GlowDrawXLib::print( char *filename, double x0, double x1, int end)
if ( new_file) {
ps->fp <<
"%!PS-Adobe-2.0 EPSF-1.2" << endl <<
"%%Creator: Proview $Id: glow_draw_xlib.cpp,v 1.8 2007-08-20 08:32:54 claes Exp $ Glow" << endl <<
"%%Creator: Proview $Id: glow_draw_xlib.cpp,v 1.9 2008-10-16 11:05:15 claes Exp $ Glow" << endl <<
"%%EndComments" << endl << endl;
}
else
......
xtt/lib/glow/src/glow_exportjbean.cpp
View file @ 5c94b4ff
/*
* Proview $Id: glow_exportjbean.cpp,v 1.18 2007-12-21 13:20:31 claes Exp $
* Proview $Id: glow_exportjbean.cpp,v 1.19 2008-10-16 11:05:15 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -976,7 +976,7 @@ void GlowExportJBean::rectrounded( double x0, double y0, double width, double he
}
void GlowExportJBean::arc( double x0, double y0, double width, double height,
double angel1, double angel2, int fill, int border,
double angle1, double angle2, int fill, int border,
glow_eDrawType fill_drawtype, glow_eDrawType border_drawtype,
int line_width, double shadow_width, int shadow,
int drawtype_incr, glow_eExportPass pass, int *shape_cnt,
......@@ -1002,9 +1002,9 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height,
" new Arc2D.Float(" << x0 - dim_x0 + glow_cJBean_Offset << "F, " <<
y0 - dim_y0 + glow_cJBean_Offset << "F, " <<
width << "F, " << height << "F, " <<
angel1 << "F, " << angel2 << "F, Arc2D." << arc_type_str <<")," << endl;
angle1 << "F, " << angle2 << "F, Arc2D." << arc_type_str <<")," << endl;
if ( !(shadow_width == 0 || angel2 != 360)) {
if ( !(shadow_width == 0 || angle2 != 360)) {
fp <<
" new Arc2D.Float(" << x0 - dim_x0 + glow_cJBean_Offset << "F, " <<
y0 - dim_y0 + glow_cJBean_Offset << "F, " <<
......@@ -1025,11 +1025,11 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height,
" new Arc2D.Float(" << x0 - dim_x0 + glow_cJBean_Offset + shadow_width << "F, " <<
y0 - dim_y0 + glow_cJBean_Offset + shadow_width << "F, " <<
width - 2*shadow_width << "F, " << height - 2*shadow_width << "F, " <<
angel1 << "F, " << angel2 << "F, Arc2D." << arc_type_str <<")," << endl <<
angle1 << "F, " << angle2 << "F, Arc2D." << arc_type_str <<")," << endl <<
" new Arc2D.Float(" << x0 - dim_x0 + glow_cJBean_Offset << "F, " <<
y0 - dim_y0 + glow_cJBean_Offset << "F, " <<
width << "F, " << height << "F, " <<
angel1 << "F, " << angel2 << "F, Arc2D." << arc_type_str <<")," << endl;
angle1 << "F, " << angle2 << "F, Arc2D." << arc_type_str <<")," << endl;
}
break;
......@@ -1040,7 +1040,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height,
}
case glow_eExportPass_Draw:
{
if ( !shadow_width || angel2 != 360) {
if ( !shadow_width || angle2 != 360) {
if ( fill) {
if ( border) {
if ( page <= 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