Skip to content

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

Dimmed added in getColor

parent 955bf263
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 30 deletions
xtt/lib/glow/src/glow_exportjbean.cpp
View file @ ed00f387
...@@ -44,6 +44,7 @@ void GlowExportJBean::growctx( glow_eExportPass pass, ofstream& fp) ...@@ -44,6 +44,7 @@ void GlowExportJBean::growctx( glow_eExportPass pass, ofstream& fp)
" int colorInverse = 0;" << endl << " int colorInverse = 0;" << endl <<
" int originalColorInverse = 0;" << endl << " int originalColorInverse = 0;" << endl <<
" int shadow = 0;" << endl << " int shadow = 0;" << endl <<
" boolean dimmed = false;" << endl <<
" public void setColorTone( int colorTone) {" << endl << " public void setColorTone( int colorTone) {" << endl <<
" this.colorTone = colorTone;" << endl << " this.colorTone = colorTone;" << endl <<
" originalColorTone = colorTone;" << endl << " originalColorTone = colorTone;" << endl <<
...@@ -284,16 +285,8 @@ void GlowExportJBean::nodeclass( GlowNodeClass *nc, glow_eExportPass pass, ...@@ -284,16 +285,8 @@ void GlowExportJBean::nodeclass( GlowNodeClass *nc, glow_eExportPass pass,
} }
fp << fp <<
" animationCount = " << nc->animation_count << ";" << endl << " animationCount = " << nc->animation_count << ";" << endl <<
" if ( dd.invisible) {" << endl << " if ( !visible)" << endl <<
" if ( !dd.invisibleOld) {" << endl <<
" dd.invisibleOld = dd.invisible;" << endl <<
" repaint();" << endl <<
" }" << endl <<
" else" << endl <<
" dd.invisibleOld = dd.invisible;" << endl <<
" return;" << endl << " return;" << endl <<
" }" << endl <<
" dd.invisibleOld = dd.invisible;" << endl <<
" Graphics2D g = (Graphics2D) g1;" << endl << " Graphics2D g = (Graphics2D) g1;" << endl <<
" float width = getWidth();" << endl << " float width = getWidth();" << endl <<
" float height = getHeight();" << endl << " float height = getHeight();" << endl <<
...@@ -499,33 +492,33 @@ void GlowExportJBean::polyline( glow_sPoint *points, int point_cnt, int fill, in ...@@ -499,33 +492,33 @@ void GlowExportJBean::polyline( glow_sPoint *points, int point_cnt, int fill, in
if ( fill_eq_border) if ( fill_eq_border)
fp << fp <<
" g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, borderColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, borderColor, dimmed));" << endl;
else if ( fill_eq_light) { else if ( fill_eq_light) {
fp << fp <<
" if ( shadow != 0) {" << endl << " if ( shadow != 0) {" << endl <<
" int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl << " int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor);" << endl << " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed);" << endl <<
" g.setColor(GeColor.shiftColor(fcolor," << -drawtype_incr << ", colorInverse));" << endl << " g.setColor(GeColor.shiftColor(fcolor," << -drawtype_incr << ", colorInverse));" << endl <<
" }" << endl << " }" << endl <<
" else" << endl << " else" << endl <<
" g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed));" << endl;
} }
else if ( fill_eq_shadow) { else if ( fill_eq_shadow) {
fp << fp <<
" if ( shadow != 0) {" << endl << " if ( shadow != 0) {" << endl <<
" int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl << " int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor);" << endl << " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed);" << endl <<
" g.setColor(GeColor.shiftColor( fcolor," << drawtype_incr << ", colorInverse));" << endl << " g.setColor(GeColor.shiftColor( fcolor," << drawtype_incr << ", colorInverse));" << endl <<
" }" << endl << " }" << endl <<
" else" << endl << " else" << endl <<
" g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed));" << endl;
} }
else else
fp << fp <<
" g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
...@@ -540,7 +533,7 @@ void GlowExportJBean::polyline( glow_sPoint *points, int point_cnt, int fill, in ...@@ -540,7 +533,7 @@ void GlowExportJBean::polyline( glow_sPoint *points, int point_cnt, int fill, in
fp << fp <<
" {" << endl << // Avoid multiple declarations of fcolor " {" << endl << // Avoid multiple declarations of fcolor
" int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl << " int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor);" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed);" << endl;
if ( !shadow) if ( !shadow)
// Shadow is choosable at runtime // Shadow is choosable at runtime
...@@ -568,7 +561,7 @@ void GlowExportJBean::polyline( glow_sPoint *points, int point_cnt, int fill, in ...@@ -568,7 +561,7 @@ void GlowExportJBean::polyline( glow_sPoint *points, int point_cnt, int fill, in
fp << fp <<
" g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl << " g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl <<
" g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, borderColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, borderColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
" g.draw( shapes[" << base_shape << "]);" << endl; " g.draw( shapes[" << base_shape << "]);" << endl;
...@@ -614,7 +607,7 @@ void GlowExportJBean::line( double x1, double y1, double x2, double y2, ...@@ -614,7 +607,7 @@ void GlowExportJBean::line( double x1, double y1, double x2, double y2,
fp << fp <<
" g.setStroke( new BasicStroke(" << line_width+1 << "F, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));" << endl << " g.setStroke( new BasicStroke(" << line_width+1 << "F, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));" << endl <<
" g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, borderColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, borderColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
" g.draw( shapes[" << *shape_cnt << "]);" << endl; " g.draw( shapes[" << *shape_cnt << "]);" << endl;
...@@ -702,7 +695,7 @@ void GlowExportJBean::rect( double x0, double y0, double width, double height, ...@@ -702,7 +695,7 @@ void GlowExportJBean::rect( double x0, double y0, double width, double height,
fp << fp <<
" {" << endl << // Avoid multiple declarations of fcolor " {" << endl << // Avoid multiple declarations of fcolor
" int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl << " int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor);" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed);" << endl;
if ( fill) if ( fill)
{ {
fp << fp <<
...@@ -744,7 +737,7 @@ void GlowExportJBean::rect( double x0, double y0, double width, double height, ...@@ -744,7 +737,7 @@ void GlowExportJBean::rect( double x0, double y0, double width, double height,
fp << fp <<
" g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl << " g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl <<
" g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, borderColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, borderColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
" g.draw( shapes[" << base_shape << "]);" << endl; " g.draw( shapes[" << base_shape << "]);" << endl;
...@@ -854,7 +847,7 @@ void GlowExportJBean::rectrounded( double x0, double y0, double width, double he ...@@ -854,7 +847,7 @@ void GlowExportJBean::rectrounded( double x0, double y0, double width, double he
fp << fp <<
" {" << endl << // Avoid multiple declarations of fcolor " {" << endl << // Avoid multiple declarations of fcolor
" int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl << " int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor);" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed);" << endl;
if ( shadow_width == 0) { if ( shadow_width == 0) {
// Print noshadow shape only // Print noshadow shape only
...@@ -943,7 +936,7 @@ void GlowExportJBean::rectrounded( double x0, double y0, double width, double he ...@@ -943,7 +936,7 @@ void GlowExportJBean::rectrounded( double x0, double y0, double width, double he
fp << fp <<
" g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl << " g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl <<
" g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, borderColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, borderColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
" g.draw( shapes[" << (*shape_cnt)++ << "]);" << endl; " g.draw( shapes[" << (*shape_cnt)++ << "]);" << endl;
...@@ -1037,7 +1030,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height, ...@@ -1037,7 +1030,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height,
} }
fp << fp <<
" g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
" g.fill( shapes[" << *shape_cnt << "]);" << endl; " g.fill( shapes[" << *shape_cnt << "]);" << endl;
...@@ -1057,7 +1050,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height, ...@@ -1057,7 +1050,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height,
fp << fp <<
" g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl << " g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl <<
" g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, borderColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, borderColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
" g.draw( shapes[" << *shape_cnt << "]);" << endl; " g.draw( shapes[" << *shape_cnt << "]);" << endl;
...@@ -1084,7 +1077,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height, ...@@ -1084,7 +1077,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height,
} }
fp << fp <<
" g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
" g.fill( shapes[" << *shape_cnt << "]);" << endl; " g.fill( shapes[" << *shape_cnt << "]);" << endl;
...@@ -1104,7 +1097,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height, ...@@ -1104,7 +1097,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height,
fp << fp <<
" g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl << " g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl <<
" g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, borderColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, borderColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
" g.draw( shapes[" << *shape_cnt << "]);" << endl; " g.draw( shapes[" << *shape_cnt << "]);" << endl;
...@@ -1141,7 +1134,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height, ...@@ -1141,7 +1134,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height,
fp << fp <<
" {" << endl << // Avoid multiple declarations of fcolor " {" << endl << // Avoid multiple declarations of fcolor
" int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl << " int fcolor = GeColor.getDrawtype(" << (int)fill_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, fillColor);" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, fillColor, dimmed);" << endl;
// Light shadow // Light shadow
...@@ -1192,7 +1185,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height, ...@@ -1192,7 +1185,7 @@ void GlowExportJBean::arc( double x0, double y0, double width, double height,
fp << fp <<
" g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl << " g.setStroke( new BasicStroke(" << line_width+1 << "F));" << endl <<
" g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)border_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, borderColor));" << endl; " colorShift, colorIntensity, colorBrightness, colorInverse, borderColor, dimmed));" << endl;
if ( page <= 1) if ( page <= 1)
fp << fp <<
" g.draw( shapes[" << *shape_cnt+5 << "]);" << endl; " g.draw( shapes[" << *shape_cnt+5 << "]);" << endl;
...@@ -1256,7 +1249,7 @@ void GlowExportJBean::text( int x0, int y0, char *text, ...@@ -1256,7 +1249,7 @@ void GlowExportJBean::text( int x0, int y0, char *text,
strcpy(bold_str, "PLAIN"); strcpy(bold_str, "PLAIN");
fp << fp <<
" g.setColor(GeColor.getColor(" << (int)color_drawtype << ", colorTone," << endl << " g.setColor(GeColor.getColor(" << (int)color_drawtype << ", colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, textColor));" << endl << " colorShift, colorIntensity, colorBrightness, colorInverse, textColor, dimmed));" << endl <<
// " g.setColor(Color.black);" << endl << // " g.setColor(Color.black);" << endl <<
" g.setFont(new Font(\"Helvetica\", Font." << bold_str << ", " << " g.setFont(new Font(\"Helvetica\", Font." << bold_str << ", " <<
text_size << "));" << endl << text_size << "));" << endl <<
...@@ -1330,7 +1323,7 @@ void GlowExportJBean::annot( int x0, int y0, int number, ...@@ -1330,7 +1323,7 @@ void GlowExportJBean::annot( int x0, int y0, int number,
((GrowCtx *)ctx)->measure_javabean( &dim_x1, &dim_x0, &dim_y1, &dim_y0); ((GrowCtx *)ctx)->measure_javabean( &dim_x1, &dim_x0, &dim_y1, &dim_y0);
fp << fp <<
" g.setColor(GeColor.getColor( annot" << number << "Color , colorTone," << endl << " g.setColor(GeColor.getColor( annot" << number << "Color , colorTone," << endl <<
" colorShift, colorIntensity, colorBrightness, colorInverse, textColor));" << endl << " colorShift, colorIntensity, colorBrightness, colorInverse, textColor, dimmed));" << endl <<
//" g.setColor(Color.black);" << endl << //" g.setColor(Color.black);" << endl <<
" g.setFont( annot" << number << "Font);" << endl << " g.setFont( annot" << number << "Font);" << endl <<
" save_tmp = g.getTransform();" << endl; " save_tmp = g.getTransform();" << endl;
......
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