Procházet zdrojové kódy

Removed 'abstract' from the output models of model_render

Yentl Van Tendeloo před 8 roky
rodič
revize
4dc72d2b94
3 změnil soubory, kde provedl 5 přidání a 5 odebrání
  1. 1 1
      classes/main_app.xml
  2. 1 1
      classes/window/main_window.xml
  3. 3 3
      frontend.py

+ 1 - 1
classes/main_app.xml

@@ -199,7 +199,7 @@
                                 <onentry>
                                 <onentry>
                                     <raise event="mv_request">
                                     <raise event="mv_request">
                                         <parameter expr="'transformation_add_AL'"/>
                                         <parameter expr="'transformation_add_AL'"/>
-                                        <parameter expr="[{'rendered': 'formalisms/MM_render', 'abstract': 'formalisms/SimpleClassDiagrams'}, {'rendered': 'formalisms/MM_render', 'abstract': 'formalisms/SimpleClassDiagrams'}, 'models/render_SCD', open('models/render_SCD.alc', 'r').read()]"/>
+                                        <parameter expr="[{'rendered': 'formalisms/MM_render', 'abstract': 'formalisms/SimpleClassDiagrams'}, {'rendered': 'formalisms/MM_render'}, 'models/render_SCD', open('models/render_SCD.alc', 'r').read()]"/>
                                     </raise>
                                     </raise>
                                     <raise event="update_status" scope="narrow" target="self.splash_window">
                                     <raise event="update_status" scope="narrow" target="self.splash_window">
                                         <parameter expr="80"/>
                                         <parameter expr="80"/>

+ 1 - 1
classes/window/main_window.xml

@@ -140,7 +140,7 @@
                     <onentry>
                     <onentry>
                         <raise event="mv_request">
                         <raise event="mv_request">
                             <parameter expr="'transformation_add_AL'"/>
                             <parameter expr="'transformation_add_AL'"/>
-                            <parameter expr="[{'rendered': 'formalisms/MM_render', 'abstract': current_metamodel}, {'rendered': 'formalisms/MM_render', 'abstract': current_metamodel}, 'render_OD/' + current_model, open('models/render_OD.alc', 'r').read()]"/>
+                            <parameter expr="[{'rendered': 'formalisms/MM_render', 'abstract': current_metamodel}, {'rendered': 'formalisms/MM_render'}, 'render_OD/' + current_model, open('models/render_OD.alc', 'r').read()]"/>
                         </raise>
                         </raise>
                     </onentry>
                     </onentry>
 
 

+ 3 - 3
frontend.py

@@ -1,7 +1,7 @@
 """
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
 
-Date:   Wed Oct  4 16:36:19 2017
+Date:   Wed Oct  4 16:42:10 2017
 
 
 Model author: Yentl Van Tendeloo
 Model author: Yentl Van Tendeloo
 Model name:   Modelverse Visual Editor - Tkinter Version 
 Model name:   Modelverse Visual Editor - Tkinter Version 
@@ -355,7 +355,7 @@ class MainApp(RuntimeClassBase):
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, self.splash_window, Event("update_status", None, [75, 'Uploading MM render...'])]))
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, self.splash_window, Event("update_status", None, [75, 'Uploading MM render...'])]))
     
     
     def _parallel_behaviour_init_modelverse_logging_in_modelverse_upload_models_upload_render_SCD_enter(self):
     def _parallel_behaviour_init_modelverse_logging_in_modelverse_upload_models_upload_render_SCD_enter(self):
-        self.raiseInternalEvent(Event("mv_request", None, ['transformation_add_AL', [{'rendered': 'formalisms/MM_render', 'abstract': 'formalisms/SimpleClassDiagrams'}, {'rendered': 'formalisms/MM_render', 'abstract': 'formalisms/SimpleClassDiagrams'}, 'models/render_SCD', open('models/render_SCD.alc', 'r').read()]]))
+        self.raiseInternalEvent(Event("mv_request", None, ['transformation_add_AL', [{'rendered': 'formalisms/MM_render', 'abstract': 'formalisms/SimpleClassDiagrams'}, {'rendered': 'formalisms/MM_render'}, 'models/render_SCD', open('models/render_SCD.alc', 'r').read()]]))
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, self.splash_window, Event("update_status", None, [80, 'Uploading render_SCD...'])]))
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, self.splash_window, Event("update_status", None, [80, 'Uploading render_SCD...'])]))
     
     
     def _parallel_behaviour_init_modelverse_logging_in_modelverse_upload_models_modify_render_SCD_trace_class_enter(self):
     def _parallel_behaviour_init_modelverse_logging_in_modelverse_upload_models_modify_render_SCD_trace_class_enter(self):
@@ -4739,7 +4739,7 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [0, 'Ready for action!'])]))
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [0, 'Ready for action!'])]))
     
     
     def _running_add_object_diagrams_init_enter(self):
     def _running_add_object_diagrams_init_enter(self):
-        self.raiseInternalEvent(Event("mv_request", None, ['transformation_add_AL', [{'rendered': 'formalisms/MM_render', 'abstract': current_metamodel}, {'rendered': 'formalisms/MM_render', 'abstract': current_metamodel}, 'render_OD/' + current_model, open('models/render_OD.alc', 'r').read()]]))
+        self.raiseInternalEvent(Event("mv_request", None, ['transformation_add_AL', [{'rendered': 'formalisms/MM_render', 'abstract': current_metamodel}, {'rendered': 'formalisms/MM_render'}, 'render_OD/' + current_model, open('models/render_OD.alc', 'r').read()]]))
     
     
     def _running_upload_MVC_load_code_enter(self):
     def _running_upload_MVC_load_code_enter(self):
         from tkFileDialog import askopenfilename
         from tkFileDialog import askopenfilename