Skip to content

P
proview
Commit 34491186 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Ge colortheme added and some modifictions in existing ones

parent 3a321dad
Hide whitespace changes
Inline Side-by-side
Showing with 451 additions and 74 deletions
src/wbl/pwrb/src/pwrb_td_colorthemeenum.wb_load
View file @ 34491186
...@@ -188,6 +188,16 @@ SObject pwrb:Type ...@@ -188,6 +188,16 @@ SObject pwrb:Type
EndBody EndBody
EndObject EndObject
!/** !/**
! Polar.
!*/
Object Polar $Value
Body SysBody
Attr PgmName = "Polar"
Attr Text = "Polar"
Attr Value = 14
EndBody
EndObject
!/**
! Custom. ! Custom.
!*/ !*/
Object Custom $Value Object Custom $Value
......
xtt/exp/ge/src/pwr_colortheme0.pwgc
View file @ 34491186
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
4803 1 4803 1
4800 360 4800 360
4801 4801
1 1 1 0.992157 0.992157 0.992157
0.88 0.88 0.88 0.872157 0.872157 0.872157
1 1 1 1 1 1
1 1 1 1 1 1
0.854841 0.854841 0.854841 0.854841 0.854841 0.854841
0.734841 0.734841 0.734841 0.734841 0.734841 0.734841
1 1 1 1 1 1
0.974841 0.974841 0.974841 0.974841 0.974841 0.974841
0.952941 0.952941 0.952941 0.941176 0.941176 0.941176
0.832941 0.832941 0.832941 0.821176 0.821176 0.821176
1 1 1 1 1 1
1 1 1 1 1 1
0.623529 0.623529 0.623529 0.623529 0.623529 0.623529
......
xtt/exp/ge/src/pwr_colortheme100.pwgc
View file @ 34491186
...@@ -3,30 +3,30 @@ ...@@ -3,30 +3,30 @@
4803 1 4803 1
4800 360 4800 360
4801 4801
0.904021 0.932586 0.971145 0.904021 0.97113 0.970336
0.784021 0.812586 0.851145 0.784021 0.85113 0.850336
1 1 1 1 1 1
1 1 1 1 1 1
0.692546 0.773129 0.852842 0.692546 0.852842 0.831662
0.572546 0.653129 0.732842 0.572546 0.732842 0.711662
0.872546 0.953129 1 0.872546 1 1
0.812546 0.893129 0.972842 0.812546 0.972842 0.951662
0.174456 0.238666 0.460288 0.694118 0.854902 0.831373
0.0544564 0.118666 0.340288 0.574118 0.734902 0.711373
0.316354 0.380564 0.602186 0.874118 1 1
0.294456 0.358666 0.580288 0.814118 0.974902 0.951373
0.588205 0.644648 0.737255 0.679728 0.588205 0.737255
0.468205 0.524648 0.617255 0.559728 0.468205 0.617255
0.768205 0.824648 0.917255 0.859728 0.768205 0.917255
0.708205 0.764648 0.857255 0.799728 0.708205 0.857255
0 0 0 0 0 0
0 0 0 0 0 0
0.04 0.04 0.04 0.04 0.04 0.04
0.12 0.12 0.12 0.12 0.12 0.12
0.861219 0.91545 0.95079 0.912474 0.95079 0.861204
0.741219 0.79545 0.83079 0.792474 0.83079 0.741204
1 1 1 1 1 1
0.981219 1 1 1 1 0.981204
0 0 0 0 0 0
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
...@@ -75,18 +75,18 @@ ...@@ -75,18 +75,18 @@
0.0507942 0.103713 0.0111208 0.0507942 0.103713 0.0111208
0.272117 0.325036 0.232444 0.272117 0.325036 0.232444
0.290794 0.343713 0.251121 0.290794 0.343713 0.251121
0.834241 0.850462 0.776898 0.571145 0.842954 0.904143
0.714241 0.730462 0.656898 0.451145 0.722954 0.784143
1 1 0.956898 0.751145 1 1
0.954241 0.970462 0.896898 0.691145 0.962954 1
0.8318 0.824872 0.825925 0.8318 0.824872 0.825925
0.7118 0.704872 0.705925 0.7118 0.704872 0.705925
1 1 1 1 1 1
0.9518 0.944872 0.945925 0.9518 0.944872 0.945925
0.86273 0.918761 0.952926 0.913725 0.952941 0.862745
0.74273 0.798761 0.832926 0.793725 0.832941 0.742745
1 1 1 1 1 1
0.98273 1 1 1 1 0.982745
0 0 0 0 0 0
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
...@@ -143,10 +143,10 @@ ...@@ -143,10 +143,10 @@
0.777704 0.548635 0 0.777704 0.548635 0
1 0.848635 0.291864 1 0.848635 0.291864
1 0.788635 0.231864 1 0.788635 0.231864
0.233692 0.316625 0.577035 0.233692 0.536751 0.57702
0.113692 0.196625 0.457035 0.113692 0.416751 0.45702
0.405216 0.488149 0.74856 0.413692 0.716751 0.75702
0.353692 0.436625 0.697035 0.353692 0.656751 0.69702
0 0 0 0 0 0
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
...@@ -183,10 +183,10 @@ ...@@ -183,10 +183,10 @@
0.88 0.88 0.68 0.88 0.88 0.68
1 1 0.98 1 1 0.98
1 1 0.92 1 1 0.92
0.735988 0.807919 0.915602 0.608759 0.912718 0.918685
0.615988 0.687919 0.795602 0.488759 0.792718 0.798685
0.915988 0.987919 1 0.788759 1 1
0.855988 0.927919 1 0.728759 1 1
0 0 0 0 0 0
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
...@@ -203,10 +203,10 @@ ...@@ -203,10 +203,10 @@
0.88 0.88 0.88 0.88 0.88 0.88
1 1 1 1 1 1
1 1 1 1 1 1
0.736004 0.833967 0.949508 0.593683 0.990295 1
0.616004 0.713967 0.829508 0.473683 0.870295 0.88
0.916004 1 1 0.773683 1 1
0.856004 0.953967 1 0.713683 1 1
0.122164 0.103639 0.103639 0.122164 0.103639 0.103639
0.002164 0 0 0.002164 0 0
0.302164 0.283639 0.283639 0.302164 0.283639 0.283639
...@@ -215,10 +215,10 @@ ...@@ -215,10 +215,10 @@
0.88 0.88 0.88 0.88 0.88 0.88
1 1 1 1 1 1
1 1 1 1 1 1
0.587213 0.650706 0.735363 0.587213 0.707439 0.735363
0.467213 0.530706 0.615363 0.467213 0.587439 0.615363
0.767213 0.830706 0.915363 0.767213 0.887439 0.915363
0.707213 0.770706 0.855363 0.707213 0.827439 0.855363
0.407843 0.407843 0.407843 0.407843 0.407843 0.407843
0.287843 0.287843 0.287843 0.287843 0.287843 0.287843
0.587843 0.587843 0.587843 0.587843 0.587843 0.587843
...@@ -243,10 +243,10 @@ ...@@ -243,10 +243,10 @@
0.75451 0.836863 0.88 0.75451 0.836863 0.88
1 1 1 1 1 1
0.99451 1 1 0.99451 1 1
0.172549 0.239216 0.458824 0.173434 0.291157 0.349996
0.052549 0.119216 0.338824 0.053434 0.171157 0.229996
0.314118 0.380784 0.600392 0.308469 0.426193 0.485031
0.292549 0.359216 0.578824 0.293434 0.411157 0.469996
1 1 1 1 1 1
0.88 0.88 0.88 0.88 0.88 0.88
1 1 1 1 1 1
...@@ -271,10 +271,10 @@ ...@@ -271,10 +271,10 @@
0.174957 0.165695 0.165695 0.174957 0.165695 0.165695
0.474957 0.465695 0.465695 0.474957 0.465695 0.465695
0.414957 0.405695 0.405695 0.414957 0.405695 0.405695
0.755581 0.856168 0.978332 0.592157 0.992157 1
0.635581 0.736168 0.858332 0.472157 0.872157 0.88
0.935581 1 1 0.772157 1 1
0.875581 0.976168 1 0.712157 1 1
0 0 0 0 0 0
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
...@@ -303,10 +303,10 @@ ...@@ -303,10 +303,10 @@
0.88 0.80549 0.695686 0.88 0.80549 0.695686
1 1 0.995686 1 1 0.995686
1 1 0.935686 1 1 0.935686
0.775021 0.833631 0.9243 0.775021 0.915724 0.9243
0.655021 0.713631 0.8043 0.655021 0.795724 0.8043
0.955021 1 1 0.955021 1 1
0.895021 0.953631 1 0.895021 1 1
0.403525 0.432395 0.511498 0.403525 0.432395 0.511498
0.283525 0.312395 0.391498 0.283525 0.312395 0.391498
0.583525 0.612395 0.691498 0.583525 0.612395 0.691498
...@@ -319,10 +319,10 @@ ...@@ -319,10 +319,10 @@
0.799295 0.819971 0.749551 0.799295 0.819971 0.749551
1 1 1 1 1 1
1 1 0.989551 1 1 0.989551
0.195987 0.260502 0.374548 0.195987 0.332769 0.374548
0.0759869 0.140502 0.254548 0.0759869 0.212769 0.254548
0.332941 0.397456 0.511502 0.341372 0.478154 0.519933
0.315987 0.380502 0.494548 0.315987 0.452769 0.494548
1 1 1 1 1 1
0.88 0.88 0.88 0.88 0.88 0.88
1 1 1 1 1 1
......
xtt/exp/ge/src/pwr_colortheme11.pwgc
View file @ 34491186
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
4803 1 4803 1
4800 360 4800 360
4801 4801
1 0.698039 0.105882 0.987686 0.815015 0.476417
0.88 0.578039 0 0.867686 0.695015 0.356417
1 0.878039 0.285882 1 0.995015 0.656417
1 0.818039 0.225882 1 0.935015 0.596417
0.770245 0.539498 0.0869612 0.833112 0.634012 0.243549
0.650245 0.419498 0 0.713112 0.514012 0.123549
0.950245 0.719498 0.266961 1 0.814012 0.423549
0.890245 0.659498 0.206961 0.953112 0.754012 0.363549
0.143542 0.0483864 0 0.143542 0.0483864 0
0.023542 0 0 0.023542 0 0
0.323542 0.228386 0.18 0.323542 0.228386 0.18
...@@ -127,10 +127,10 @@ ...@@ -127,10 +127,10 @@
0.021176 0 0 0.021176 0 0
0.321176 0.227059 0.18 0.321176 0.227059 0.18
0.261176 0.167059 0.12 0.261176 0.167059 0.12
1 0.698039 0.105882 0.988235 0.815686 0.47451
0.88 0.578039 0 0.868235 0.695686 0.35451
1 0.878039 0.285882 1 0.995686 0.65451
1 0.818039 0.225882 1 0.935686 0.59451
0 0 0 0 0 0
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
......
xtt/exp/ge/src/pwr_colortheme14.pwgc 0 → 100644
View file @ 34491186
48
4802 0
4803 1
4800 360
4801
0.904021 0.932586 0.971145
0.784021 0.812586 0.851145
1 1 1
1 1 1
0.692546 0.773129 0.852842
0.572546 0.653129 0.732842
0.872546 0.953129 1
0.812546 0.893129 0.972842
0.174456 0.238666 0.460288
0.0544564 0.118666 0.340288
0.316354 0.380564 0.602186
0.294456 0.358666 0.580288
0.588205 0.644648 0.737255
0.468205 0.524648 0.617255
0.768205 0.824648 0.917255
0.708205 0.764648 0.857255
0 0 0
0 0 0
0.04 0.04 0.04
0.12 0.12 0.12
0.861219 0.91545 0.95079
0.741219 0.79545 0.83079
1 1 1
0.981219 1 1
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
0.988235 0.0666667 0.0666667
0.868235 0 0
1 0.246667 0.246667
1 0.186667 0.186667
1 0.670588 0.670588
0.88 0.550588 0.550588
1 0.850588 0.850588
1 0.790588 0.790588
1 0.760784 0.760784
0.88 0.640784 0.640784
1 0.940784 0.940784
1 0.880784 0.880784
1 0.898039 0.898039
0.88 0.778039 0.778039
1 1 1
1 1 1
1 0.898039 0.898039
0.88 0.778039 0.778039
1 1 1
1 1 1
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
0.131121 0.144091 0.223713
0.0111208 0.0240909 0.103713
0.229329 0.242299 0.32192
0.251121 0.264091 0.343713
0.170794 0.223713 0.131121
0.0507942 0.103713 0.0111208
0.272117 0.325036 0.232444
0.290794 0.343713 0.251121
0.834241 0.850462 0.776898
0.714241 0.730462 0.656898
1 1 0.956898
0.954241 0.970462 0.896898
0.8318 0.824872 0.825925
0.7118 0.704872 0.705925
1 1 1
0.9518 0.944872 0.945925
0.86273 0.918761 0.952926
0.74273 0.798761 0.832926
1 1 1
0.98273 1 1
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
0.196078 0.933333 0
0.0760784 0.813333 0
0.376078 1 0.18
0.316078 1 0.12
0.698039 1 0.564706
0.578039 0.88 0.444706
0.878039 1 0.744706
0.818039 1 0.684706
0.807843 1 0.760784
0.687843 0.88 0.640784
0.987843 1 0.940784
0.927843 1 0.880784
0.870588 1 0.835294
0.750588 0.88 0.715294
1 1 1
0.990588 1 0.955294
0.870588 1 0.835294
0.750588 0.88 0.715294
1 1 1
0.990588 1 0.955294
0.177417 0.223713 0.131121
0.0574166 0.103713 0.0111208
0.279512 0.325808 0.233217
0.297417 0.343713 0.251121
0.756115 0.804623 0.873045
0.636115 0.684623 0.753045
0.936115 0.984623 1
0.876115 0.924623 0.993045
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
0.897704 0.668635 0.111864
0.777704 0.548635 0
1 0.848635 0.291864
1 0.788635 0.231864
0.233692 0.316625 0.577035
0.113692 0.196625 0.457035
0.405216 0.488149 0.74856
0.353692 0.436625 0.697035
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
0.662745 0.662745 0.662745
0.542745 0.542745 0.542745
0.842745 0.842745 0.842745
0.782745 0.782745 0.782745
0.509804 0.509804 0.509804
0.389804 0.389804 0.389804
0.689804 0.689804 0.689804
0.629804 0.629804 0.629804
1 0.976471 0.0901961
0.88 0.856471 0
1 1 0.270196
1 1 0.210196
1 1 0.729412
0.88 0.88 0.609412
1 1 0.909412
1 1 0.849412
0.972549 0.937255 0.65098
0.852549 0.817255 0.53098
1 1 0.83098
1 1 0.77098
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
1 1 0.8
0.88 0.88 0.68
1 1 0.98
1 1 0.92
0.735988 0.807919 0.915602
0.615988 0.687919 0.795602
0.915988 0.987919 1
0.855988 0.927919 1
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
0.690196 0.690196 0.690196
0.570196 0.570196 0.570196
0.870196 0.870196 0.870196
0.810196 0.810196 0.810196
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
0.736004 0.833967 0.949508
0.616004 0.713967 0.829508
0.916004 1 1
0.856004 0.953967 1
0.122164 0.103639 0.103639
0.002164 0 0
0.302164 0.283639 0.283639
0.242164 0.223639 0.223639
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
0.587213 0.650706 0.735363
0.467213 0.530706 0.615363
0.767213 0.830706 0.915363
0.707213 0.770706 0.855363
0.407843 0.407843 0.407843
0.287843 0.287843 0.287843
0.587843 0.587843 0.587843
0.527843 0.527843 0.527843
0.419608 0.8 1
0.299608 0.68 0.88
0.599608 0.98 1
0.539608 0.92 1
0.670588 0.882353 0.992157
0.550588 0.762353 0.872157
0.850588 1 1
0.790588 1 1
0.670588 0.882353 0.992157
0.550588 0.762353 0.872157
0.850588 1 1
0.790588 1 1
0.87451 0.956863 1
0.75451 0.836863 0.88
1 1 1
0.99451 1 1
0.87451 0.956863 1
0.75451 0.836863 0.88
1 1 1
0.99451 1 1
0.172549 0.239216 0.458824
0.052549 0.119216 0.338824
0.314118 0.380784 0.600392
0.292549 0.359216 0.578824
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
0.822446 0.873304 0.766705
0.702446 0.753304 0.646705
1 1 0.946705
0.942446 0.993304 0.886705
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
0.102602 0.074815 0.074815
0 0 0
0.282602 0.254815 0.254815
0.222602 0.194815 0.194815
0.294957 0.285695 0.285695
0.174957 0.165695 0.165695
0.474957 0.465695 0.465695
0.414957 0.405695 0.405695
0.755581 0.856168 0.978332
0.635581 0.736168 0.858332
0.935581 1 1
0.875581 0.976168 1
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
1 0.576471 0
0.88 0.456471 0
1 0.756471 0.18
1 0.696471 0.12
1 0.713725 0.321569
0.88 0.593725 0.201569
1 0.893725 0.501569
1 0.833725 0.441569
0.984314 0.815686 0.584314
0.864314 0.695686 0.464314
1 0.995686 0.764314
1 0.935686 0.704314
1 0.92549 0.815686
0.88 0.80549 0.695686
1 1 0.995686
1 1 0.935686
1 0.92549 0.815686
0.88 0.80549 0.695686
1 1 0.995686
1 1 0.935686
0.775021 0.833631 0.9243
0.655021 0.713631 0.8043
0.955021 1 1
0.895021 0.953631 1
0.403525 0.432395 0.511498
0.283525 0.312395 0.391498
0.583525 0.612395 0.691498
0.523525 0.552395 0.631498
0.0128939 0 0
0 0 0
0.192894 0.18 0.18
0.132894 0.12 0.12
0.919295 0.939971 0.869551
0.799295 0.819971 0.749551
1 1 1
1 1 0.989551
0.195987 0.260502 0.374548
0.0759869 0.140502 0.254548
0.332941 0.397456 0.511502
0.315987 0.380502 0.494548
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
1 1 1
0.88 0.88 0.88
1 1 1
1 1 1
0.854902 0.301961 0.984314
0.734902 0.181961 0.864314
1 0.481961 1
0.974902 0.421961 1
0.901961 0.584314 0.988235
0.781961 0.464314 0.868235
1 0.764314 1
1 0.704314 1
0.92549 0.741176 1
0.80549 0.621176 0.88
1 0.921176 1
1 0.861176 1
0.968627 0.854902 1
0.848627 0.734902 0.88
1 1 1
1 0.974902 1
0.968627 0.854902 1
0.848627 0.734902 0.88
1 1 1
1 0.974902 1
99
xtt/lib/ge/src/ge.cpp
View file @ 34491186
...@@ -1624,6 +1624,7 @@ static tThemes themes[] = { ...@@ -1624,6 +1624,7 @@ static tThemes themes[] = {
{"OchreContrast", 11}, {"OchreContrast", 11},
{"Chesterfield", 12}, {"Chesterfield", 12},
{"TerraVerte", 13}, {"TerraVerte", 13},
{"Polar", 14},
{"Custom", 100}}; {"Custom", 100}};
static void ge_colortheme_selector_ok_cb( void *ctx, char *text) static void ge_colortheme_selector_ok_cb( void *ctx, char *text)
...@@ -1638,7 +1639,7 @@ static void ge_colortheme_selector_ok_cb( void *ctx, char *text) ...@@ -1638,7 +1639,7 @@ static void ge_colortheme_selector_ok_cb( void *ctx, char *text)
} }
} }
if( idx > 0) if( idx >= 0)
gectx->graph->update_color_theme( idx); gectx->graph->update_color_theme( idx);
} }
......
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