Commit c43a9324 authored by claes's avatar claes

Changes in 3.4 that had disapperad...

parent 8f1a7c74
...@@ -100,12 +100,12 @@ int FlowPscript::print_page( double ll_x, double ll_y, double ur_x, double ur_y) ...@@ -100,12 +100,12 @@ int FlowPscript::print_page( double ll_x, double ll_y, double ur_x, double ur_y)
} }
int FlowPscript::rect( double x, double y, double width, double height, flow_eDrawType type, int FlowPscript::rect( double x, double y, double width, double height, flow_eDrawType type,
int idx) double idx)
{ {
if ( type == flow_eDrawType_LineDashed) if ( type == flow_eDrawType_LineDashed)
{ {
fprintf( file, "gsave\n"); fprintf( file, "gsave\n");
fprintf( file, "[%d %d] %d setdash\n", 3 + idx, 3 + idx, 0); fprintf( file, "[%f %f] %d setdash\n", 3 + idx, 3 + idx, 0);
} }
else if ( type == flow_eDrawType_LineGray) else if ( type == flow_eDrawType_LineGray)
{ {
...@@ -130,7 +130,7 @@ int FlowPscript::rect( double x, double y, double width, double height, flow_eDr ...@@ -130,7 +130,7 @@ int FlowPscript::rect( double x, double y, double width, double height, flow_eDr
} }
int FlowPscript::filled_rect( double x, double y, double width, double height, flow_eDrawType type, int FlowPscript::filled_rect( double x, double y, double width, double height, flow_eDrawType type,
int idx) double idx)
{ {
if ( type == flow_eDrawType_LineGray) if ( type == flow_eDrawType_LineGray)
{ {
...@@ -155,7 +155,7 @@ int FlowPscript::filled_rect( double x, double y, double width, double height, f ...@@ -155,7 +155,7 @@ int FlowPscript::filled_rect( double x, double y, double width, double height, f
} }
int FlowPscript::arc( double x, double y, double width, double height, int angel1, int angel2, int FlowPscript::arc( double x, double y, double width, double height, int angel1, int angel2,
flow_eDrawType type, int idx) flow_eDrawType type, double idx)
{ {
double r = 0.5*width; double r = 0.5*width;
double pi = 3.14159; double pi = 3.14159;
...@@ -163,7 +163,7 @@ int FlowPscript::arc( double x, double y, double width, double height, int angel ...@@ -163,7 +163,7 @@ int FlowPscript::arc( double x, double y, double width, double height, int angel
if ( type == flow_eDrawType_LineDashed) if ( type == flow_eDrawType_LineDashed)
{ {
fprintf( file, "gsave\n"); fprintf( file, "gsave\n");
fprintf( file, "[%d %d] %d setdash\n", 3 + idx, 3 + idx, 0); fprintf( file, "[%f %f] %d setdash\n", 3 + idx, 3 + idx, 0);
} }
else if ( type == flow_eDrawType_LineGray) else if ( type == flow_eDrawType_LineGray)
{ {
...@@ -196,12 +196,12 @@ int FlowPscript::arc( double x, double y, double width, double height, int angel ...@@ -196,12 +196,12 @@ int FlowPscript::arc( double x, double y, double width, double height, int angel
} }
int FlowPscript::line( double x1, double y1, double x2, double y2, flow_eDrawType type, int FlowPscript::line( double x1, double y1, double x2, double y2, flow_eDrawType type,
int idx) double idx)
{ {
if ( type == flow_eDrawType_LineDashed) if ( type == flow_eDrawType_LineDashed)
{ {
fprintf( file, "gsave\n"); fprintf( file, "gsave\n");
fprintf( file, "[%d %d] %d setdash\n", 3 + idx, 3 + idx, 0); fprintf( file, "[%f %f] %d setdash\n", 3 + idx, 3 + idx, 0);
} }
else if ( type == flow_eDrawType_LineGray) else if ( type == flow_eDrawType_LineGray)
{ {
...@@ -312,7 +312,7 @@ int FlowPscript::pixmap( double x, double y, flow_sPixmapDataElem *data, ...@@ -312,7 +312,7 @@ int FlowPscript::pixmap( double x, double y, flow_sPixmapDataElem *data,
} }
int FlowPscript::arrow( double x1, double y1, double x2, double y2, int FlowPscript::arrow( double x1, double y1, double x2, double y2,
double x3, double y3, flow_eDrawType type, int idx) double x3, double y3, flow_eDrawType type, double idx)
{ {
if ( type == flow_eDrawType_LineGray) if ( type == flow_eDrawType_LineGray)
...@@ -342,8 +342,8 @@ void FlowPscript::move( double x, double y) ...@@ -342,8 +342,8 @@ void FlowPscript::move( double x, double y)
} }
void FlowPscript::setlinewidth( int idx) void FlowPscript::setlinewidth( double idx)
{ {
fprintf( file,"%d setlinewidth\n", 1 + idx); fprintf( file,"%f setlinewidth\n", idx);
} }
...@@ -9,17 +9,17 @@ class FlowPscript { ...@@ -9,17 +9,17 @@ class FlowPscript {
FlowPscript( char *filename, void *flow_ctx, int page_border, int *sts); FlowPscript( char *filename, void *flow_ctx, int page_border, int *sts);
~FlowPscript(); ~FlowPscript();
int print_page( double ll_x, double ll_y, double ur_x, double ur_y); int print_page( double ll_x, double ll_y, double ur_x, double ur_y);
int rect( double x, double y, double width, double height, flow_eDrawType type, int idx); int rect( double x, double y, double width, double height, flow_eDrawType type, double idx);
int filled_rect( double x, double y, double width, double height, flow_eDrawType type, int idx); int filled_rect( double x, double y, double width, double height, flow_eDrawType type, double idx);
int arc( double x, double y, double width, double height, int angel1, int angel2, int arc( double x, double y, double width, double height, int angel1, int angel2,
flow_eDrawType type, int idx); flow_eDrawType type, double idx);
int line( double x1, double y1, double x2, double y2, flow_eDrawType type, int idx); int line( double x1, double y1, double x2, double y2, flow_eDrawType type, double idx);
int text( double x, double y, char *text, int len, flow_eDrawType type, int size); int text( double x, double y, char *text, int len, flow_eDrawType type, int size);
int pixmap( double x, double y, flow_sPixmapDataElem *data, flow_eDrawType type); int pixmap( double x, double y, flow_sPixmapDataElem *data, flow_eDrawType type);
int arrow( double x1, double y1, double x2, double y2, int arrow( double x1, double y1, double x2, double y2,
double x3, double y3, flow_eDrawType type, int idx); double x3, double y3, flow_eDrawType type, double idx);
void move( double x, double y); void move( double x, double y);
void setlinewidth( int idx); void setlinewidth( double idx);
void rowbreak(); void rowbreak();
double offset_x; double offset_x;
double offset_y; double offset_y;
......
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