renamed "color" to "hue" in pen-blocks and in location sensor

pull/89/head
jmoenig 2019-01-08 17:28:52 +01:00
rodzic 600ec731d2
commit 7d877a6244
5 zmienionych plików z 18 dodań i 17 usunięć

Wyświetl plik

@ -5,6 +5,7 @@
* Objects: automatically parse csv files on import, experimental "raw data" and "parse" ops * Objects: automatically parse csv files on import, experimental "raw data" and "parse" ops
* Lists: fixed an off-by-one error in becomeLinked() * Lists: fixed an off-by-one error in becomeLinked()
* Store: optimized serialization of lists with atomic data in project files * Store: optimized serialization of lists with atomic data in project files
* Blocks, Objects, Threads: renamed "color" to "hue" in pen-blocks and in location sensor
### 2019-01-07 ### 2019-01-07
* Lists, Objects: directly export and import lists as csv files, under construction * Lists, Objects: directly export and import lists as csv files, under construction

Wyświetl plik

@ -7,7 +7,7 @@
<script type="text/javascript" src="src/morphic.js?version=2019-01-01"></script> <script type="text/javascript" src="src/morphic.js?version=2019-01-01"></script>
<script type="text/javascript" src="src/widgets.js?version=2018-10-02"></script> <script type="text/javascript" src="src/widgets.js?version=2018-10-02"></script>
<script type="text/javascript" src="src/blocks.js?version=2019-01-04"></script> <script type="text/javascript" src="src/blocks.js?version=2019-01-04"></script>
<script type="text/javascript" src="src/threads.js?version=2019-01-04"></script> <script type="text/javascript" src="src/threads.js?version=2019-01-08"></script>
<script type="text/javascript" src="src/objects.js?version=2019-01-08"></script> <script type="text/javascript" src="src/objects.js?version=2019-01-08"></script>
<script type="text/javascript" src="src/gui.js?version=2019-01-02"></script> <script type="text/javascript" src="src/gui.js?version=2019-01-02"></script>
<script type="text/javascript" src="src/paint.js?version=2018-10-02"></script> <script type="text/javascript" src="src/paint.js?version=2018-10-02"></script>

Wyświetl plik

@ -148,7 +148,7 @@ CustomCommandBlockMorph, SymbolMorph, ToggleButtonMorph, DialMorph*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.blocks = '2019-January-04'; modules.blocks = '2019-January-08';
var SyntaxElementMorph; var SyntaxElementMorph;
var BlockMorph; var BlockMorph;
@ -1301,21 +1301,21 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
null, null,
false, false,
{ {
color : ['color'], hue : ['hue'],
saturation : ['saturation'], saturation : ['saturation'],
brightness : ['brightness'], brightness : ['brightness'],
transparency : ['transparency'] transparency : ['transparency']
}, },
true true
); );
part.setContents(['front']); part.setContents(['hue']);
break; break;
case '%asp': // aspect case '%asp': // aspect
part = new InputSlotMorph( part = new InputSlotMorph(
null, null,
false, false,
{ {
color : ['color'], hue : ['hue'],
saturation : ['saturation'], saturation : ['saturation'],
brightness : ['brightness'], brightness : ['brightness'],
transparency : ['transparency'], transparency : ['transparency'],
@ -1324,7 +1324,7 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
}, },
true true
); );
part.setContents(['color']); part.setContents(['hue']);
break; break;
case '%txtfun': case '%txtfun':
part = new InputSlotMorph( part = new InputSlotMorph(

Wyświetl plik

@ -508,14 +508,14 @@ SpriteMorph.prototype.initBlocks = function () {
type: 'command', type: 'command',
category: 'pen', category: 'pen',
spec: 'set pen %hsva to %n', spec: 'set pen %hsva to %n',
defaults: [['color'], 50] defaults: [['hue'], 50]
}, },
changePenHSVA: { changePenHSVA: {
only: SpriteMorph, only: SpriteMorph,
type: 'command', type: 'command',
category: 'pen', category: 'pen',
spec: 'change pen %hsva by %n', spec: 'change pen %hsva by %n',
defaults: [['color'], 10] defaults: [['hue'], 10]
}, },
changeSize: { changeSize: {
only: SpriteMorph, only: SpriteMorph,
@ -741,7 +741,7 @@ SpriteMorph.prototype.initBlocks = function () {
type: 'reporter', type: 'reporter',
category: 'sensing', category: 'sensing',
spec: '%asp at %loc', spec: '%asp at %loc',
defaults: [['color']] defaults: [['hue']]
}, },
reportStackSize: { reportStackSize: {
dev: true, dev: true,
@ -1234,7 +1234,7 @@ SpriteMorph.prototype.initBlockMigrations = function () {
}, },
setHue: { setHue: {
selector: 'setPenHSVA', selector: 'setPenHSVA',
inputs: [['color']], inputs: [['hue']],
offset: 1 offset: 1
}, },
setBrightness: { setBrightness: {
@ -1244,7 +1244,7 @@ SpriteMorph.prototype.initBlockMigrations = function () {
}, },
changeHue: { changeHue: {
selector: 'changePenHSVA', selector: 'changePenHSVA',
inputs: [['color']], inputs: [['hue']],
offset: 1 offset: 1
}, },
changeBrightness: { changeBrightness: {

Wyświetl plik

@ -62,7 +62,7 @@ StageMorph, SpriteMorph, StagePrompterMorph, Note, modules, isString, copy,
isNil, WatcherMorph, List, ListWatcherMorph, alert, console, TableMorph, Color, isNil, WatcherMorph, List, ListWatcherMorph, alert, console, TableMorph, Color,
TableFrameMorph, ColorSlotMorph, isSnapObject, Map*/ TableFrameMorph, ColorSlotMorph, isSnapObject, Map*/
modules.threads = '2019-January-04'; modules.threads = '2019-January-08';
var ThreadManager; var ThreadManager;
var Process; var Process;
@ -3091,7 +3091,7 @@ Process.prototype.goToLayer = function (name) {
Process.prototype.setPenHSVA = function (name, num) { Process.prototype.setPenHSVA = function (name, num) {
var choice = this.inputOption(name), var choice = this.inputOption(name),
options = ['color', 'saturation', 'brightness', 'transparency'], options = ['hue', 'saturation', 'brightness', 'transparency'],
thisObj = this.blockReceiver(); thisObj = this.blockReceiver();
if (thisObj instanceof SpriteMorph) { if (thisObj instanceof SpriteMorph) {
thisObj.setColorComponentHSVA(options.indexOf(choice), +num); thisObj.setColorComponentHSVA(options.indexOf(choice), +num);
@ -3100,7 +3100,7 @@ Process.prototype.setPenHSVA = function (name, num) {
Process.prototype.changePenHSVA = function (name, num) { Process.prototype.changePenHSVA = function (name, num) {
var choice = this.inputOption(name), var choice = this.inputOption(name),
options = ['color', 'saturation', 'brightness', 'transparency'], options = ['hue', 'saturation', 'brightness', 'transparency'],
thisObj = this.blockReceiver(); thisObj = this.blockReceiver();
if (thisObj instanceof SpriteMorph) { if (thisObj instanceof SpriteMorph) {
thisObj.changeColorComponentHSVA(options.indexOf(choice), +num); thisObj.changeColorComponentHSVA(options.indexOf(choice), +num);
@ -3275,7 +3275,7 @@ Process.prototype.reportAspect = function (aspect, location) {
// ---------------- // ----------------
// left input (aspect): // left input (aspect):
// //
// 'color' - hsv HUE on a scale of 0 - 100 // 'hue' - hsv HUE on a scale of 0 - 100
// 'saturation' - hsv SATURATION on a scale of 0 - 100 // 'saturation' - hsv SATURATION on a scale of 0 - 100
// 'brightness' - hsv VALUE on a scale of 0 - 100 // 'brightness' - hsv VALUE on a scale of 0 - 100
// 'transparency' - rgba ALPHA on a reversed (!) scale of 0 - 100 // 'transparency' - rgba ALPHA on a reversed (!) scale of 0 - 100
@ -3301,7 +3301,7 @@ Process.prototype.reportAspect = function (aspect, location) {
var choice = this.inputOption(aspect), var choice = this.inputOption(aspect),
target = this.inputOption(location), target = this.inputOption(location),
options = ['color', 'saturation', 'brightness', 'transparency'], options = ['hue', 'saturation', 'brightness', 'transparency'],
idx = options.indexOf(choice), idx = options.indexOf(choice),
thisObj = this.blockReceiver(), thisObj = this.blockReceiver(),
thatObj, thatObj,