File tree Expand file tree Collapse file tree 2 files changed +18
-5
lines changed Expand file tree Collapse file tree 2 files changed +18
-5
lines changed Original file line number Diff line number Diff line change @@ -159,13 +159,26 @@ export class ExtendedPythonGenerator extends PythonGenerator {
159
159
this . definitions_ [ 'import_' + importModule ] = 'import ' + importModule ;
160
160
}
161
161
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
+
162
175
finish ( code : string ) : string {
163
176
if ( ! this . currentModule ) {
164
177
return super . finish ( code ) ;
165
178
}
166
179
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 ) ;
169
182
170
183
// Convert the definitions dictionary into a list.
171
184
const imports = [ ] ;
@@ -186,7 +199,7 @@ export class ExtendedPythonGenerator extends PythonGenerator {
186
199
code = Blockly . CodeGenerator . prototype . finish ( code ) ;
187
200
this . isInitialized = false ;
188
201
189
- let class_def = "class " + className + "(" + classType + "):\n" ;
202
+ let class_def = "class " + className + "(" + classParent + "):\n" ;
190
203
if ( ! code ) {
191
204
code = "pass" ;
192
205
}
Original file line number Diff line number Diff line change @@ -45,8 +45,8 @@ export type Workspace = Module & {
45
45
} ;
46
46
47
47
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 ' ;
50
50
51
51
export const MODULE_NAME_PLACEHOLDER = '%module_name%' ;
52
52
You can’t perform that action at this time.
0 commit comments