c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support for resizing simulator based on usage of parts

Browse Source
This commit is contained in:
Peli de Halleux 2016-08-30 17:18:03 -07:00
parent 8f50beb938
commit 90da72a8de
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pxtarget.json
View File

@ -75,7 +75,13 @@
}, },
"simulator": { "simulator": {
"autoRun": true, "autoRun": true,
"aspectRatio": 0.69 "aspectRatio": 1.22,
"partsAspectRatio": 0.69,
"builtinParts": {
"accelerometer": true,
"buttonpair": true,
"ledmatrix": true
}
}, },
"compileService": { "compileService": {
"yottaTarget": "bbc-microbit-classic-gcc", "yottaTarget": "bbc-microbit-classic-gcc",
@ -136,4 +142,4 @@
"userVoiceApiKey": "WEkkIGaj1WtJnSUF59iwaA", "userVoiceApiKey": "WEkkIGaj1WtJnSUF59iwaA",
"userVoiceForumId": 402381 "userVoiceForumId": 402381
} }
} }

8
sim/visuals/boardhost.ts
View File

@ -14,16 +14,16 @@ namespace pxsim.visuals {
constructor(state: DalBoard, boardDef: BoardDefinition, cmpsList: string[], cmpDefs: Map<ComponentDefinition>, fnArgs: any) { constructor(state: DalBoard, boardDef: BoardDefinition, cmpsList: string[], cmpDefs: Map<ComponentDefinition>, fnArgs: any) {
this.state = state; this.state = state;
let onboardCmps = boardDef.onboardComponents || []; let onboardCmps = boardDef.onboardComponents || [];
let activeComponents = cmpsList.filter(c => onboardCmps.indexOf(c) < 0); let activeComponents = (cmpsList || []).filter(c => onboardCmps.indexOf(c) < 0);
activeComponents.sort(); activeComponents.sort();
if (boardDef.visual === "microbit") { // if (boardDef.visual === "microbit") {
this.boardView = new visuals.MicrobitBoardSvg({ this.boardView = new visuals.MicrobitBoardSvg({
runtime: runtime, runtime: runtime,
theme: visuals.randomTheme(), theme: visuals.randomTheme(),
disableTilt: false disableTilt: false
}); });
} else { // } else {
//TODO: port Arduino/generic board //TODO: port Arduino/generic board
// this.boardView = new visuals.GenericBoardSvg({ // this.boardView = new visuals.GenericBoardSvg({
// boardDef: boardDef, // boardDef: boardDef,
@ -32,7 +32,7 @@ namespace pxsim.visuals {
// runtime: runtime, // runtime: runtime,
// fnArgs: fnArgs // fnArgs: fnArgs
// }) // })
} // }
const VIEW_WIDTH = "100%"; const VIEW_WIDTH = "100%";
const VIEW_HEIGHT = "100%"; const VIEW_HEIGHT = "100%";