Commit 19d9b0af authored by Claes Sjofors's avatar Claes Sjofors

Xtt colottheme on operator window

parent d0b46b44
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
48
4802 0
4803 1
4800 360
4801
0.943938 0.97116 0.904021
0.823938 0.85116 0.784021
1 1 1
1 1 1
0.817685 0.852842 0.692546
0.697685 0.732842 0.572546
0.997685 1 0.872546
0.937685 0.972842 0.812546
0.233875 0.316625 0.158755
0.113875 0.196625 0.0387549
0.356621 0.439371 0.281501
0.353875 0.436625 0.278755
0.660975 0.737255 0.58822
0.540975 0.617255 0.46822
0.840975 0.917255 0.76822
0.780975 0.857255 0.70822
0 0 0
0 0 0
0.18 0.18 0.18
0.12 0.12 0.12
0.946609 0.95079 0.861234
0.826609 0.83079 0.741234
1 1 1
1 1 0.981234
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.182864 0.223713 0.131121
0.0628641 0.103713 0.0111208
0.285595 0.326444 0.233852
0.302864 0.343713 0.251121
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.94902 0.952941 0.862745
0.82902 0.832941 0.742745
1 1 1
1 1 0.982745
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.816007 0.87306 0.75613
0.696007 0.75306 0.63613
0.996007 1 0.93613
0.936007 0.99306 0.87613
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.231373 0.317647 0.156863
0.111373 0.197647 0.0368627
0.353725 0.44 0.279216
0.351373 0.437647 0.276863
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.790494 0.927489 0.639216
0.670494 0.807489 0.519216
0.970494 1 0.819216
0.910494 1 0.759216
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.85771 0.943572 0.624353
0.73771 0.823572 0.504353
1 1 0.804353
0.97771 1 0.744353
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.648936 0.735363 0.587213
0.528936 0.615363 0.467213
0.828936 0.915363 0.767213
0.768936 0.855363 0.707213
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.231373 0.317647 0.156863
0.111373 0.197647 0.0368627
0.353725 0.44 0.279216
0.351373 0.437647 0.276863
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.851209 0.966766 0.562829
0.731209 0.846766 0.442829
1 1 0.742829
0.971209 1 0.682829
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.864225 0.9243 0.775036
0.744225 0.8043 0.655036
1 1 0.955036
0.984225 1 0.895036
0.453544 0.511498 0.403525
0.333544 0.391498 0.283525
0.633544 0.691498 0.583525
0.573544 0.631498 0.523525
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.294118 0.374548 0.196002
0.174118 0.254548 0.0760021
0.434996 0.515426 0.33688
0.414118 0.494548 0.316002
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
...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
4803 1 4803 1
4800 360 4800 360
4801 4801
1 0.816938 0.983108 1 0.884565 0.986786
0.88 0.696938 0.863108 0.88 0.764565 0.866786
1 0.996938 1 1 1 1
1 0.936938 1 1 1 1
0.843107 0.702785 0.830915 0.841886 0.760693 0.894179
0.723107 0.582785 0.710915 0.721886 0.640693 0.774179
1 0.882785 1 1 0.940693 1
0.963107 0.822785 0.950915 0.961886 0.880693 1
0.643229 0.928283 0.90396 0.0985122 0.388281 0.754162
0.523229 0.808283 0.78396 0 0.268281 0.634162
0.823229 1 1 0.278512 0.568281 0.934162
0.763229 1 1 0.218512 0.508281 0.874162
0.623529 0.623529 0.623529 0.623529 0.623529 0.623529
0.503529 0.503529 0.503529 0.503529 0.503529 0.503529
0.803529 0.803529 0.803529 0.803529 0.803529 0.803529
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
0.12 0.12 0.12 0.12 0.12 0.12
1 0.882353 0.717647 1 1 1
0.88 0.762353 0.597647 0.88 0.88 0.88
1 1 0.897647 1 1 1
1 1 0.837647 1 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
...@@ -75,18 +75,18 @@ ...@@ -75,18 +75,18 @@
0.303331 0.156341 0.307115 0.303331 0.156341 0.307115
0.603331 0.456341 0.607115 0.603331 0.456341 0.607115
0.543331 0.396341 0.547115 0.543331 0.396341 0.547115
0.34934 0.803784 0.994629 0.748302 0.480674 0.439338
0.22934 0.683784 0.874629 0.628302 0.360674 0.319338
0.52934 0.983784 1 0.928302 0.660674 0.619338
0.46934 0.923784 1 0.868302 0.600674 0.559338
0.723415 0.783932 0.779004 0.777829 0.723415 0.783917
0.603415 0.663932 0.659004 0.657829 0.603415 0.663917
0.903415 0.963932 0.959004 0.957829 0.903415 0.963917
0.843415 0.903932 0.899004 0.897829 0.843415 0.903917
1 0.882353 0.717647 1 1 1
0.88 0.762353 0.597647 0.88 0.88 0.88
1 1 0.897647 1 1 1
1 1 0.837647 1 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
...@@ -135,18 +135,18 @@ ...@@ -135,18 +135,18 @@
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
0.12 0.12 0.12 0.12 0.12 0.12
0 0 0 1 1 1
0 0 0 0.88 0.88 0.88
0.18 0.18 0.18 1 1 1
0.12 0.12 0.12 1 1 1
1 0.375982 0.166705 1 0.375982 0.166705
0.88 0.255982 0.046705 0.88 0.255982 0.046705
1 0.555982 0.346705 1 0.555982 0.346705
1 0.495982 0.286705 1 0.495982 0.286705
0.985702 0.83621 0.626932 1 0.911101 0.74873
0.865702 0.71621 0.506932 0.88 0.791101 0.62873
1 1 0.806932 1 1 0.92873
1 0.95621 0.746932 1 1 0.86873
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
1 0.623529 0.239216 0.595285 0.798489 0.975067
0.88 0.503529 0.119216 0.475285 0.678489 0.855067
1 0.803529 0.419216 0.775285 0.978489 1
1 0.743529 0.359216 0.715285 0.918489 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.999405 0.624598 0.240742 0.709697 0.865339 1
0.879405 0.504598 0.120742 0.589697 0.745339 0.88
1 0.804598 0.420742 0.889697 1 1
1 0.744598 0.360742 0.829697 0.985339 1
0.247059 0.247059 0.247059 0.247059 0.247059 0.247059
0.127059 0.127059 0.127059 0.127059 0.127059 0.127059
0.427059 0.427059 0.427059 0.427059 0.427059 0.427059
...@@ -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.72549 0.784314 0.780392 0.780392 0.72549 0.784314
0.60549 0.664314 0.660392 0.660392 0.60549 0.664314
0.90549 0.964314 0.960392 0.960392 0.90549 0.964314
0.84549 0.904314 0.900392 0.900392 0.84549 0.904314
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,18 +243,18 @@ ...@@ -243,18 +243,18 @@
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.643137 0.929412 0.905882 0.0980392 0.388235 0.756863
0.523137 0.809412 0.785882 0 0.268235 0.636863
0.823137 1 1 0.278039 0.568235 0.936863
0.763137 1 1 0.218039 0.508235 0.876863
0 0 0 1 1 1
0 0 0 0.88 0.88 0.88
0.18 0.18 0.18 1 1 1
0.12 0.12 0.12 1 1 1
1 0.882353 0.717647 1 0.913725 0.74902
0.88 0.762353 0.597647 0.88 0.793725 0.62902
1 1 0.897647 1 1 0.92902
1 1 0.837647 1 1 0.86902
0 0 0 0 0 0
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
0.786249 0.822824 0.88 0.786249 0.822824 0.88
1 1 1 1 1 1
1 1 1 1 1 1
0.799069 0.785351 0.877714 0.956634 0.892927 0.928695
0.679069 0.665351 0.757714 0.836634 0.772927 0.808695
0.979069 0.965351 1 1 1 1
0.919069 0.905351 0.997714 1 1 1
0.830243 0.850385 0.928695 0.830243 0.850385 0.928695
0.710243 0.730385 0.808695 0.710243 0.730385 0.808695
1 1 1 1 1 1
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
0 0 0 0 0 0
0.18 0.18 0.18 0.18 0.18 0.18
0.12 0.12 0.12 0.12 0.12 0.12
0.898039 1 0.996078 1 0.965377 0.898024
0.778039 0.88 0.876078 0.88 0.845377 0.778024
1 1 1 1 1 1
1 1 1 1 1 1
0 0 0 0 0 0
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
0.583777 0.530797 0.601233 0.583777 0.530797 0.601233
0.883777 0.830797 0.901233 0.883777 0.830797 0.901233
0.823777 0.770797 0.841233 0.823777 0.770797 0.841233
0.898039 1 0.996078 1 0.968627 0.898039
0.778039 0.88 0.876078 0.88 0.848627 0.778039
1 1 1 1 1 1
1 1 1 1 1 1
0 0 0 0 0 0
...@@ -143,8 +143,8 @@ ...@@ -143,8 +143,8 @@
0.797769 0.71238 0.147216 0.797769 0.71238 0.147216
1 1 0.447216 1 1 0.447216
1 0.95238 0.387216 1 0.95238 0.387216
0.990005 0.960296 0.98555 0.991669 0.927977 0.987961
0.870005 0.840296 0.86555 0.871669 0.807977 0.867961
1 1 1 1 1 1
1 1 1 1 1 1
0 0 0 0 0 0
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,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.796139 0.768368 0.768368 0.846769 0.846769 0.846769
0.676139 0.648368 0.648368 0.726769 0.726769 0.726769
0.976139 0.948368 0.948368 1 1 1
0.916139 0.888368 0.888368 0.966769 0.966769 0.966769
0.185489 0.185489 0.185489 0.185489 0.185489 0.185489
0.065489 0.065489 0.065489 0.065489 0.065489 0.065489
0.365489 0.365489 0.365489 0.365489 0.365489 0.365489
......
...@@ -919,6 +919,16 @@ void CoWowGtk::CreateFileSelDia( const char *title, void *parent_ctx, ...@@ -919,6 +919,16 @@ void CoWowGtk::CreateFileSelDia( const char *title, void *parent_ctx,
gtk_file_filter_add_pattern( filter, "*.pwg"); gtk_file_filter_add_pattern( filter, "*.pwg");
gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(dialog), filter); gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(dialog), filter);
} }
else if ( file_type == wow_eFileSelType_ColorTheme) {
pwr_tFileName folder;
dcli_translate_filename( folder, "$pwrp_pop");
gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(dialog), folder);
GtkFileFilter *filter = gtk_file_filter_new();
gtk_file_filter_set_name( filter, "*.pwgc");
gtk_file_filter_add_pattern( filter, "*.pwgc");
gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(dialog), filter);
}
else if ( file_type == wow_eFileSelType_Image) { else if ( file_type == wow_eFileSelType_Image) {
pwr_tFileName folder; pwr_tFileName folder;
dcli_translate_filename( folder, "$pwrp_pop"); dcli_translate_filename( folder, "$pwrp_pop");
......
...@@ -52,6 +52,7 @@ typedef enum { ...@@ -52,6 +52,7 @@ typedef enum {
wow_eFileSelType_Image, wow_eFileSelType_Image,
wow_eFileSelType_History, wow_eFileSelType_History,
wow_eFileSelType_Backup, wow_eFileSelType_Backup,
wow_eFileSelType_ColorTheme,
wow_eFileSelType__ wow_eFileSelType__
} wow_eFileSelType; } wow_eFileSelType;
......
...@@ -808,6 +808,16 @@ void GeGtk::activate_select_colortheme(GtkWidget *w, gpointer gectx) ...@@ -808,6 +808,16 @@ void GeGtk::activate_select_colortheme(GtkWidget *w, gpointer gectx)
((Ge *)gectx)->activate_select_colortheme(); ((Ge *)gectx)->activate_select_colortheme();
} }
void GeGtk::activate_customcolors_read(GtkWidget *w, gpointer gectx)
{
((Ge *)gectx)->activate_customcolors_read();
}
void GeGtk::activate_customcolors_write(GtkWidget *w, gpointer gectx)
{
((Ge *)gectx)->activate_customcolors_write();
}
void GeGtk::activate_import_graph(GtkWidget *w, gpointer gectx) void GeGtk::activate_import_graph(GtkWidget *w, gpointer gectx)
{ {
((Ge *)gectx)->wow->CreateFileSelDia( "Graph Selection", (void *)gectx, ((Ge *)gectx)->wow->CreateFileSelDia( "Graph Selection", (void *)gectx,
...@@ -1687,6 +1697,23 @@ GeGtk::GeGtk( void *x_parent_ctx, ...@@ -1687,6 +1697,23 @@ GeGtk::GeGtk( void *x_parent_ctx,
't', GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK), 't', GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK),
GTK_ACCEL_VISIBLE); GTK_ACCEL_VISIBLE);
// Submenu customcolors
GtkWidget *file_customcolors_read = gtk_menu_item_new_with_mnemonic( "_Read");
g_signal_connect( file_customcolors_read, "activate",
G_CALLBACK(activate_customcolors_read), this);
GtkWidget *file_customcolors_write = gtk_menu_item_new_with_mnemonic( "_Save");
g_signal_connect( file_customcolors_write, "activate",
G_CALLBACK(activate_customcolors_write), this);
GtkWidget *file_customcolors = gtk_menu_item_new_with_mnemonic( "CustomColors");
GtkMenu *file_customcolors_menu = (GtkMenu *) g_object_new( GTK_TYPE_MENU, NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(file_customcolors_menu), file_customcolors_read);
gtk_menu_shell_append(GTK_MENU_SHELL(file_customcolors_menu), file_customcolors_write);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(file_customcolors),
GTK_WIDGET(file_customcolors_menu));
GtkWidget *file_subgraphs = gtk_menu_item_new_with_mnemonic( "_Loaded Subgraphs..."); GtkWidget *file_subgraphs = gtk_menu_item_new_with_mnemonic( "_Loaded Subgraphs...");
g_signal_connect( file_subgraphs, "activate", g_signal_connect( file_subgraphs, "activate",
G_CALLBACK(activate_subgraphs), this); G_CALLBACK(activate_subgraphs), this);
...@@ -1765,6 +1792,7 @@ GeGtk::GeGtk( void *x_parent_ctx, ...@@ -1765,6 +1792,7 @@ GeGtk::GeGtk( void *x_parent_ctx,
gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_build); gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_build);
gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_graph_attr); gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_graph_attr);
gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_select_colortheme); gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_select_colortheme);
gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_customcolors);
gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_subgraphs); gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_subgraphs);
gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_export); gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_export);
gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_import_graph); gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_import_graph);
......
...@@ -193,6 +193,8 @@ class GeGtk : public Ge { ...@@ -193,6 +193,8 @@ class GeGtk : public Ge {
static void activate_export_plcfo( GtkWidget *w, gpointer gectx); static void activate_export_plcfo( GtkWidget *w, gpointer gectx);
static void activate_export_plcfo_as( GtkWidget *w, gpointer gectx); static void activate_export_plcfo_as( GtkWidget *w, gpointer gectx);
static void activate_select_colortheme(GtkWidget *w, gpointer gectx); static void activate_select_colortheme(GtkWidget *w, gpointer gectx);
static void activate_customcolors_read(GtkWidget *w, gpointer gectx);
static void activate_customcolors_write(GtkWidget *w, gpointer gectx);
static void activate_import_graph( GtkWidget *w, gpointer gectx); static void activate_import_graph( GtkWidget *w, gpointer gectx);
static void activate_import_image( GtkWidget *w, gpointer gectx); static void activate_import_image( GtkWidget *w, gpointer gectx);
static void activate_generate_web( GtkWidget *w, gpointer gectx); static void activate_generate_web( GtkWidget *w, gpointer gectx);
......
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
#include "ge_subgraphs.h" #include "ge_subgraphs.h"
#include "ge_util.h" #include "ge_util.h"
#include "ge_msg.h" #include "ge_msg.h"
#include "cow_wow.h"
#include "wb_wnav_selformat.h" #include "wb_wnav_selformat.h"
#include "wb_nav.h" #include "wb_nav.h"
#include "wb_log.h" #include "wb_log.h"
...@@ -1654,13 +1655,51 @@ void Ge::activate_select_colortheme() ...@@ -1654,13 +1655,51 @@ void Ge::activate_select_colortheme()
strcpy( names[9], "Contrast"); strcpy( names[9], "Contrast");
strcpy( names[10], "AzureContrast"); strcpy( names[10], "AzureContrast");
strcpy( names[11], "OchreContrast"); strcpy( names[11], "OchreContrast");
strcpy( names[11], "Chesterfield");
strcpy( names[11], "TerraVerte");
strcpy( names[11], "Custom");
strcpy( names[12], ""); strcpy( names[12], "");
wow->CreateList( "ColorTheme Selector", (char *)names, sizeof(names[0]), wow->CreateList( "ColorTheme Selector", (char *)names, sizeof(names[0]),
ge_colortheme_selector_ok_cb, 0, this); ge_colortheme_selector_ok_cb, 0, this);
} }
void Ge::activate_customcolors_read()
{
wow->CreateFileSelDia( "CustomColors Selection", (void *)this,
customcolors_selected_cb, wow_eFileSelType_ColorTheme);
}
void Ge::customcolors_selected_cb( void *ctx, char *filename, wow_eFileSelType file_type)
{
Ge *ge = (Ge *)ctx;
pwr_tCmd cmd;
sprintf( cmd, "custom read/file=\"%s\"", filename);
ge->command( cmd);
}
void Ge::activate_customcolors_write()
{
open_input_dialog( "CustomColors name", "CustomColors Save ", "",
Ge::customcolors_write_cb);
}
void Ge::customcolors_write_cb( Ge *gectx, char *name)
{
Ge *ge = (Ge *)gectx;
pwr_tCmd cmd;
pwr_tFileName fname;
if ( strchr( name, '/') == 0) {
strcpy( fname, "$pwrp_pop/");
strcat( fname, name);
}
else
strcpy( fname, name);
sprintf( cmd, "custom write/file=\"%s\"", fname);
ge->command( cmd);
}
void Ge::activate_subgraphs() void Ge::activate_subgraphs()
{ {
......
...@@ -65,6 +65,9 @@ class SubGraphs; ...@@ -65,6 +65,9 @@ class SubGraphs;
typedef void *grow_tObject; typedef void *grow_tObject;
typedef void *GlowCtx; typedef void *GlowCtx;
#endif #endif
#ifndef cow_wow_h
#include "cow_wow.h"
#endif
/* ge.h -- Simple graphic editor */ /* ge.h -- Simple graphic editor */
...@@ -156,7 +159,6 @@ class Ge { ...@@ -156,7 +159,6 @@ class Ge {
void open_graph( char *name); void open_graph( char *name);
int set_focus( void *component); int set_focus( void *component);
void activate_change_text(); void activate_change_text();
void activate_change_name(); void activate_change_name();
void activate_preview_start(); void activate_preview_start();
...@@ -221,6 +223,8 @@ class Ge { ...@@ -221,6 +223,8 @@ class Ge {
void activate_graph_attr(); void activate_graph_attr();
void activate_open(); void activate_open();
void activate_select_colortheme(); void activate_select_colortheme();
void activate_customcolors_read();
void activate_customcolors_write();
void activate_subgraphs(); void activate_subgraphs();
void activate_reset_mode(); void activate_reset_mode();
void activate_rect( bool keep); void activate_rect( bool keep);
...@@ -286,6 +290,8 @@ class Ge { ...@@ -286,6 +290,8 @@ class Ge {
void activate_confirm_cancel(); void activate_confirm_cancel();
static int get_plant_select_cb( void *ge_ctx, char *select_name, int size); static int get_plant_select_cb( void *ge_ctx, char *select_name, int size);
static void customcolors_selected_cb( void *ctx, char *filename, wow_eFileSelType file_type);
static void customcolors_write_cb( Ge *gectx, char *name);
static void load_graph_cb( void *ge_ctx, char *name); static void load_graph_cb( void *ge_ctx, char *name);
static void save_graph( Ge *gectx, char *name); static void save_graph( Ge *gectx, char *name);
static void save_graph_and_close( Ge *gectx, char *name); static void save_graph_and_close( Ge *gectx, char *name);
......
...@@ -5523,6 +5523,11 @@ int Graph::get_dimension( char *filename, const char *def_path, ...@@ -5523,6 +5523,11 @@ int Graph::get_dimension( char *filename, const char *def_path,
return grow_GetDimension( fname, width, height); return grow_GetDimension( fname, width, height);
} }
int Graph::get_colortheme_colors( char *file, double **colors, int *size) {
return grow_GetColorThemeColors( file, colors, size);
}
static void graph_free_dyn( grow_tObject object) static void graph_free_dyn( grow_tObject object)
{ {
if ( grow_GetObjectType( object) == glow_eObjectType_GrowNode || if ( grow_GetObjectType( object) == glow_eObjectType_GrowNode ||
......
...@@ -1376,6 +1376,8 @@ class Graph { ...@@ -1376,6 +1376,8 @@ class Graph {
else return 1; else return 1;
} }
static int get_colortheme_colors( char *file, double **colors, int *size);
//! Enable event logging //! Enable event logging
static void eventlog_enable( int enable) { grow_EventLogEnable( enable);} static void eventlog_enable( int enable) { grow_EventLogEnable( enable);}
......
...@@ -959,7 +959,7 @@ typedef enum { ...@@ -959,7 +959,7 @@ typedef enum {
#define glow_eCtColor_ButtonTextcolor glow_eDrawType_CustomColor38 #define glow_eCtColor_ButtonTextcolor glow_eDrawType_CustomColor38
#define glow_eCtColor_ButtonInsensitiveTextcolor glow_eDrawType_CustomColor39 #define glow_eCtColor_ButtonInsensitiveTextcolor glow_eDrawType_CustomColor39
#define glow_eCtColor_ButtonInsensitiveBordercolor glow_eDrawType_CustomColor40 #define glow_eCtColor_ButtonInsensitiveBordercolor glow_eDrawType_CustomColor40
#define glow_eCtColor_YellowIndicatorYellow glow_eDrawType_CustomColor41 #define glow_eCtColor_YellowIndicator glow_eDrawType_CustomColor41
#define glow_eCtColor_YellowCurve glow_eDrawType_CustomColor42 #define glow_eCtColor_YellowCurve glow_eDrawType_CustomColor42
#define glow_eCtColor_YellowBar glow_eDrawType_CustomColor43 #define glow_eCtColor_YellowBar glow_eDrawType_CustomColor43
#define glow_eCtColor_YellowBarLimit glow_eDrawType_CustomColor44 #define glow_eCtColor_YellowBarLimit glow_eDrawType_CustomColor44
......
...@@ -189,7 +189,7 @@ int GlowCustomColors::read_colorfile( GrowCtx *ctx, char *name) ...@@ -189,7 +189,7 @@ int GlowCustomColors::read_colorfile( GrowCtx *ctx, char *name)
found = 1; found = 1;
// Add some search path // Add some search path
if ( !found) { if ( !found && ctx) {
for ( int i = 0; i < ctx->path_cnt; i++) { for ( int i = 0; i < ctx->path_cnt; i++) {
strcpy( path_name, ctx->path[i]); strcpy( path_name, ctx->path[i]);
strcat( path_name, filename); strcat( path_name, filename);
...@@ -213,8 +213,28 @@ int GlowCustomColors::read_colorfile( GrowCtx *ctx, char *name) ...@@ -213,8 +213,28 @@ int GlowCustomColors::read_colorfile( GrowCtx *ctx, char *name)
open( fp); open( fp);
fp.close(); fp.close();
ctx->gdraw->reset_customcolors( this); if ( ctx)
ctx->gdraw->reset_customcolors( this);
return GLOW__SUCCESS; return GLOW__SUCCESS;
} }
int GlowCustomColors::get_colortheme_colors( char *file, double **colorvect, int *size)
{
int sts;
GlowCustomColors cc;
static double cv[(glow_eDrawType_CustomColor__-glow_eDrawType_CustomColor1)*3];
sts = cc.read_colorfile( 0, file);
if ( EVEN(sts))
return sts;
for ( int i = 0; i < 360; i++) {
for ( int j = 0; j < 3; j++)
cv[i*3+j] = cc.colors[i][j];
}
*colorvect = cv;
*size = (glow_eDrawType_CustomColor__-glow_eDrawType_CustomColor1)*3;
return GLOW__SUCCESS;
}
...@@ -70,6 +70,7 @@ class GlowCustomColors { ...@@ -70,6 +70,7 @@ class GlowCustomColors {
int read_colorfile( GrowCtx *ctx, char *name); int read_colorfile( GrowCtx *ctx, char *name);
void set_colortheme_lightness( int lightness) { colortheme_lightness = lightness;} void set_colortheme_lightness( int lightness) { colortheme_lightness = lightness;}
void set_colortheme_is_default( int isdefault) { is_default_colortheme = isdefault;} void set_colortheme_is_default( int isdefault) { is_default_colortheme = isdefault;}
static int get_colortheme_colors( char *file, double **colorvect, int *size);
int colors_size; int colors_size;
int colortheme_lightness; int colortheme_lightness;
......
...@@ -5400,6 +5400,12 @@ void *grow_GetCustomColors( grow_tCtx ctx) ...@@ -5400,6 +5400,12 @@ void *grow_GetCustomColors( grow_tCtx ctx)
return (void *)ctx->get_custom_colors(); return (void *)ctx->get_custom_colors();
} }
int grow_GetColorThemeColors( char *file, double **colors, int *size)
{
return GlowCustomColors::get_colortheme_colors( file, colors, size);
}
int grow_ReadCustomColorFile( grow_tCtx ctx, char *name) int grow_ReadCustomColorFile( grow_tCtx ctx, char *name)
{ {
return ctx->read_customcolor_file( name); return ctx->read_customcolor_file( name);
......
...@@ -3098,6 +3098,7 @@ extern "C" { ...@@ -3098,6 +3098,7 @@ extern "C" {
void grow_SetEditSetMode( grow_tCtx ctx, glow_eEditSetMode mode); void grow_SetEditSetMode( grow_tCtx ctx, glow_eEditSetMode mode);
int grow_SetCustomColor( grow_tCtx ctx, glow_eDrawType color, double red, double green, double blue); int grow_SetCustomColor( grow_tCtx ctx, glow_eDrawType color, double red, double green, double blue);
void *grow_GetCustomColors( grow_tCtx ctx); void *grow_GetCustomColors( grow_tCtx ctx);
int grow_GetColorThemeColors( char *file, double **colors, int *size);
int grow_ReadCustomColorFile( grow_tCtx ctx, char *name); int grow_ReadCustomColorFile( grow_tCtx ctx, char *name);
int grow_WriteCustomColorFile( grow_tCtx ctx, char *name); int grow_WriteCustomColorFile( grow_tCtx ctx, char *name);
void grow_SetDefaultColorTheme( char *theme); void grow_SetDefaultColorTheme( char *theme);
......
This diff is collapsed.
...@@ -70,13 +70,16 @@ class OpGtk : public Op { ...@@ -70,13 +70,16 @@ class OpGtk : public Op {
GtkWidget *parent_wid_op; GtkWidget *parent_wid_op;
GtkWidget *toplevel; GtkWidget *toplevel;
GtkWidget *alarmcnt_label; GtkWidget *alarmcnt_label;
GtkWidget *aalarm_mark;
GtkWidget *aalarm_label[5]; GtkWidget *aalarm_label[5];
GtkWidget *aalarm_active[5]; GtkWidget *aalarm_active[5];
GtkWidget *aalarm_active_box[5];
GtkWidget *aalarm_info[5]; GtkWidget *aalarm_info[5];
GtkWidget *aalarm_filler[5]; GtkWidget *aalarm_filler[5];
GtkWidget *aalarm_box[5]; GtkWidget *aalarm_box[5];
GtkWidget *balarm_label; GtkWidget *balarm_label;
GtkWidget *balarm_active; GtkWidget *balarm_active;
GtkWidget *balarm_active_box;
GtkWidget *balarm_info; GtkWidget *balarm_info;
GtkWidget *balarm_box; GtkWidget *balarm_box;
GtkWidget *balarm_ebox; GtkWidget *balarm_ebox;
...@@ -88,6 +91,13 @@ class OpGtk : public Op { ...@@ -88,6 +91,13 @@ class OpGtk : public Op {
GtkWidget *funcbox[5]; GtkWidget *funcbox[5];
GtkMenuBar *menu_bar; GtkMenuBar *menu_bar;
GtkWidget *title_label; GtkWidget *title_label;
GtkWidget *appl_buttons[25];
GtkWidget *tools;
GtkWidget *tools2;
GdkColor red_color;
GdkColor yellow_color;
GdkColor green_color;
GdkColor gray_color;
int a_height; int a_height;
int a_exist[5]; int a_exist[5];
int a_active[5]; int a_active[5];
...@@ -106,6 +116,7 @@ class OpGtk : public Op { ...@@ -106,6 +116,7 @@ class OpGtk : public Op {
int delete_menu_item( const char *name); int delete_menu_item( const char *name);
void change_sup_color( void *imagew, op_eSupColor color); void change_sup_color( void *imagew, op_eSupColor color);
void set_title( char *user); void set_title( char *user);
void set_color_theme( int idx);
static void activate_exit( GtkWidget *w, gpointer data); static void activate_exit( GtkWidget *w, gpointer data);
static void activate_aalarm_ack( GtkWidget *w, gpointer data); static void activate_aalarm_ack( GtkWidget *w, gpointer data);
......
...@@ -381,7 +381,7 @@ void Op::sup_scan( void *data) ...@@ -381,7 +381,7 @@ void Op::sup_scan( void *data)
if ( color != op->sup_vect[i].old_color) { if ( color != op->sup_vect[i].old_color) {
op->sup_vect[i].old_color = color; op->sup_vect[i].old_color = color;
op->change_sup_color( op->sup_vect[i].imagew, color); op->change_sup_color( op->sup_vect[i].indw, color);
} }
} }
op->sup_timerid->add( time, sup_scan, op); op->sup_timerid->add( time, sup_scan, op);
......
...@@ -75,14 +75,19 @@ typedef enum { ...@@ -75,14 +75,19 @@ typedef enum {
class OpSup { class OpSup {
public: public:
OpSup() : buttonw(0), imagew(0), p(0), old_color(op_eSupColor_), flash(0) OpSup() : buttonw(0), indw(0), indfiller1w(0), indfiller2w(0),
textw(0), textbgw(0), p(0), old_color(op_eSupColor_), flash(0)
{ strcpy( node_name, ""); strcpy( object_name, "");} { strcpy( node_name, ""); strcpy( object_name, "");}
pwr_tOid node_oid; pwr_tOid node_oid;
pwr_tOName object_name; pwr_tOName object_name;
pwr_tObjName node_name; pwr_tObjName node_name;
void *buttonw; void *buttonw;
void *imagew; void *indw;
void *indfiller1w;
void *indfiller2w;
void *textw;
void *textbgw;
pwr_tStatus *p; pwr_tStatus *p;
pwr_tRefId refid; pwr_tRefId refid;
op_eSupColor old_color; op_eSupColor old_color;
...@@ -124,6 +129,7 @@ class Op { ...@@ -124,6 +129,7 @@ class Op {
virtual int delete_menu_item( const char *name) { return 0;} virtual int delete_menu_item( const char *name) { return 0;}
virtual void change_sup_color( void *imagew, op_eSupColor color) {} virtual void change_sup_color( void *imagew, op_eSupColor color) {}
virtual void set_title( char *user) {} virtual void set_title( char *user) {}
virtual void set_color_theme( int idx) {}
void set_jop_qid( int qix) { if ( jop) jop->set_jop_qid( qix);}; void set_jop_qid( int qix) { if ( jop) jop->set_jop_qid( qix);};
void scan(); void scan();
......
...@@ -3771,6 +3771,8 @@ int XNav::init_brow_base_cb( FlowCtx *fctx, void *client_data) ...@@ -3771,6 +3771,8 @@ int XNav::init_brow_base_cb( FlowCtx *fctx, void *client_data)
strcat( cmd, " /closebutton"); strcat( cmd, " /closebutton");
xnav->command( cmd); xnav->command( cmd);
if ( xnav->op)
xnav->op->set_color_theme( xnav->gbl.color_theme);
// xnav->load_ev_from_opplace(); // xnav->load_ev_from_opplace();
// xnav->appl_startup(); // xnav->appl_startup();
} }
......
...@@ -9791,6 +9791,8 @@ static void xnav_colortheme_selector_ok_cb( void *ctx, char *text) ...@@ -9791,6 +9791,8 @@ static void xnav_colortheme_selector_ok_cb( void *ctx, char *text)
((XttGe *)elem->ctx)->update_color_theme( idx); ((XttGe *)elem->ctx)->update_color_theme( idx);
} }
} }
if ( xnav->op)
xnav->op->set_color_theme( idx);
} }
free( vd); free( vd);
} }
......
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