Skip to content

Commit 596893f

Browse files
committed
Changed module types to be all lowercase
1 parent 25ce1fd commit 596893f

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

src/editor/extended_python_generator.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,26 @@ export class ExtendedPythonGenerator extends PythonGenerator {
159159
this.definitions_['import_' + importModule] = 'import ' + importModule;
160160
}
161161

162+
classParentFromModuleType(moduleType : string) : string{
163+
if(moduleType == commonStorage.MODULE_TYPE_WORKSPACE){
164+
return "Robot";
165+
}
166+
if(moduleType == commonStorage.MODULE_TYPE_OPMODE){
167+
return "OpMode";
168+
}
169+
if(moduleType == commonStorage.MODULE_TYPE_MECHANISM){
170+
return "OpMode";
171+
}
172+
return "";
173+
}
174+
162175
finish(code: string): string {
163176
if (!this.currentModule) {
164177
return super.finish(code);
165178
}
166179
let className = this.currentModule.moduleName;
167-
let classType = this.currentModule.moduleType;
168-
this.addImport(classType);
180+
let classParent = this.classParentFromModuleType(this.currentModule.moduleType);
181+
this.addImport(classParent);
169182

170183
// Convert the definitions dictionary into a list.
171184
const imports = [];
@@ -186,7 +199,7 @@ export class ExtendedPythonGenerator extends PythonGenerator {
186199
code = Blockly.CodeGenerator.prototype.finish(code);
187200
this.isInitialized = false;
188201

189-
let class_def = "class " + className + "(" + classType + "):\n";
202+
let class_def = "class " + className + "(" + classParent + "):\n";
190203
if (!code) {
191204
code = "pass";
192205
}

src/storage/common_storage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ export type Workspace = Module & {
4545
};
4646

4747
export const MODULE_TYPE_WORKSPACE = 'workspace';
48-
export const MODULE_TYPE_OPMODE = 'OpMode';
49-
export const MODULE_TYPE_MECHANISM = 'Mechanism';
48+
export const MODULE_TYPE_OPMODE = 'opmode';
49+
export const MODULE_TYPE_MECHANISM = 'mechanism';
5050

5151
export const MODULE_NAME_PLACEHOLDER = '%module_name%';
5252

0 commit comments

Comments
 (0)