diff --git a/crlcore/etc/common/colors.py b/crlcore/etc/common/colors.py index 321eec24..0f82815c 100644 --- a/crlcore/etc/common/colors.py +++ b/crlcore/etc/common/colors.py @@ -14,6 +14,7 @@ import string +from helpers.io import ErrorMessage stdColors = \ @@ -22,11 +23,15 @@ stdColors = \ , 'Gray238' : '238,238,238' , 'White' : '255,255,255' , 'Seashell4' : '139,134,130' + , 'Ivory' : '255,255,240' + , 'Linen' : '250,240,230' , 'Red' : '255,0,0' # Shade of Reds. , 'OrangeRed' : "255,69,0" , 'DarkOrange' : "255,140,0" , 'Orange' : "255,165,0" , 'Wheat' : "245,222,179" + , 'wheat1' : "255,231,186" + , 'Pink' : '255,192,203' , 'LightPink' : '255,182,193' , 'Green' : '0,255,0' # Shade of Green. , 'LawnGreen' : '124,252,0' diff --git a/crlcore/etc/common/display.py b/crlcore/etc/common/display.py index 6c202ada..3b7b8252 100644 --- a/crlcore/etc/common/display.py +++ b/crlcore/etc/common/display.py @@ -207,11 +207,12 @@ def createStyles ( scale=1.0 ): style.addDrawingStyle( group='Viewer', name='foreground' , color=toRGB('White' ), border=1 ) style.addDrawingStyle( group='Viewer', name='rubber' , color=toRGB('192,0,192' ), border=4, threshold=0.02*scale ) style.addDrawingStyle( group='Viewer', name='phantom' , color=toRGB('Seashell4' ), border=1 ) - style.addDrawingStyle( group='Viewer', name='boundaries' , color=toRGB('208,199,192'), border=1, pattern='0000000000000000', threshold=0 ) + #style.addDrawingStyle( group='Viewer', name='boundaries' , color=toRGB('208,199,192'), border=2, threshold=0 ) + style.addDrawingStyle( group='Viewer', name='boundaries' , color=toRGB('wheat1') , border=2, threshold=0 ) style.addDrawingStyle( group='Viewer', name='marker' , color=toRGB('80,250,80' ), border=1 ) style.addDrawingStyle( group='Viewer', name='selectionDraw' , color=toRGB('White' ), border=1 ) style.addDrawingStyle( group='Viewer', name='selectionFill' , color=toRGB('White' ), border=1 ) - style.addDrawingStyle( group='Viewer', name='grid' , color=toRGB('White' ), border=1, threshold=2.0*scale ) + style.addDrawingStyle( group='Viewer', name='grid' , color=toRGB('White' ), border=1, threshold=8.0*scale ) style.addDrawingStyle( group='Viewer', name='spot' , color=toRGB('White' ), border=2, threshold=6.0*scale ) style.addDrawingStyle( group='Viewer', name='ghost' , color=toRGB('White' ), border=1 ) style.addDrawingStyle( group='Viewer', name='text.ruler' , color=toRGB('White' ), border=1, threshold= 0.0*scale )