Changeset f2e199e in sasview

Timestamp:

Nov 22, 2018 1:47:13 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

72651df

Parents:

21e71f1

Message:

Allow editing models with corresponding C-files. SASVIEW-1208

Location:

src/sas/qtgui/Utilities

Files:

• ModelEditor.py (modified) (2 diffs)
• PythonSyntax.py (modified) (5 diffs)
• TabbedModelEditor.py (modified) (2 diffs)

src/sas/qtgui/Utilities/ModelEditor.py

@@ -12 +12 @@
     """
     modelModified = QtCore.pyqtSignal()
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, is_python=True):
         super(ModelEditor, self).__init__(parent)
         self.setupUi(self)
+
+        self.is_python = is_python
 
         self.setupWidgets()
@@ -29 +31 @@
         # DO NOT MOVE TO TOP
         from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter
-        self.highlight = PythonHighlighter(self.txtEditor.document())
+        self.highlight = PythonHighlighter(self.txtEditor.document(), is_python=self.is_python)
 
         self.txtEditor.setFont(GuiUtils.getMonospaceFont())

src/sas/qtgui/Utilities/PythonSyntax.py

@@ -36 +36 @@
     """
     # Python keywords
-    keywords = [
+    python_keywords = [
         'and', 'assert', 'break', 'class', 'continue', 'def',
         'del', 'elif', 'else', 'except', 'exec', 'finally',
@@ -43 +43 @@
         'raise', 'return', 'try', 'while', 'yield',
         'None', 'True', 'False',
+    ]
+
+    # C keywords
+    c_keywords = [
+        'auto', 'break', 'case', 'char',
+        'const', 'continue', 'default', 'do',
+        'double', 'else', 'enum', 'extern',
+        'float', 'for', 'goto', 'if',
+        'int', 'long', 'register', 'return',
+        'short', 'signed', 'sizeof', 'static',
+        'struct', 'switch', 'typedef', 'union',
+        'unsigned', 'void', 'volatile', 'while'
     ]
 
@@ -62 +74 @@
         '\{', '\}', '\(', '\)', '\[', '\]',
     ]
-    def __init__(self, document):
+    def __init__(self, document, is_python=True):
         QSyntaxHighlighter.__init__(self, document)
 
@@ -74 +86 @@
 
         # Keyword, operator, and brace rules
+        keywords = PythonHighlighter.python_keywords if is_python \
+            else PythonHighlighter.c_keywords
         rules += [(r'\b%s\b' % w, 0, STYLES['keyword'])
-            for w in PythonHighlighter.keywords]
+            for w in keywords]
         rules += [(r'%s' % o, 0, STYLES['operator'])
             for o in PythonHighlighter.operators]
@@ -104 +118 @@
             (r'\b[+-]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\b', 0, STYLES['numbers']),
         ]
+        # Add "//" to comments for C
+        if not is_python:
+            rules.append((r'//[^\n]*', 0, STYLES['comment']),)
 
         # Build a QRegExp for each pattern

src/sas/qtgui/Utilities/TabbedModelEditor.py

@@ -117 +117 @@
             return
 
+        # remove c-plugin tab, if present.
+        if self.tabWidget.count()>1:
+            self.tabWidget.removeTab(1)
         self.loadFile(filename)
 
@@ -130 +133 @@
         self.filename = filename
         display_name, _ = os.path.splitext(os.path.basename(filename))
-
         self.setWindowTitle(self.window_title + " - " + display_name)
+        # Name the tab with .py filename
+        display_name = os.path.basename(filename)
+        self.tabWidget.setTabText(0, display_name)
+
+        # See if there is filename.c present
+        c_path = self.filename.replace(".py", ".c")
+        if not os.path.isfile(c_path): return
+        # add a tab with the same highlighting
+        display_name = os.path.basename(c_path)
+        self.c_editor_widget = ModelEditor(self, is_python=False)
+        self.tabWidget.addTab(self.c_editor_widget, display_name)
+        # Read in the file and set in on the widget
+        with open(c_path, 'r') as plugin:
+            self.c_editor_widget.txtEditor.setPlainText(plugin.read())
+        self.c_editor_widget.modelModified.connect(self.editorModelModified)
 
     def onModifiedExit(self):