250714.1

Author: graham-trott

dist/easycoder-250706.1-py2.py3-none-any.whl renamed to dist/easycoder-250714.1-py2.py3-none-any.whl

@@ -9,4 +9,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250706.1"
+__version__ = "250714.1"

dist/easycoder-250706.1.tar.gz renamed to dist/easycoder-250714.1.tar.gz

@@ -149,14 +149,14 @@ def doValue(self, value):
 		elif valType == 'symbol':
 			name = value['name']
 			symbolRecord = self.getSymbolRecord(name)
-			if symbolRecord['hasValue']:
-				handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
-				result = handler(symbolRecord)
-			else:
-				# Call the given domain to handle a value
-				domain = self.domainIndex[value['domain']]
-				handler = domain.valueHandler(value['type'])
-				if handler: result = handler(value)
+			# if symbolRecord['hasValue']:
+			handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
+			result = handler(symbolRecord)
+		# 	else:
+		# 		# Call the given domain to handle a value
+		# 		# domain = self.domainIndex[value['domain']]
+		# 		handler = domain.valueHandler(value['type'])
+		# 		if handler: result = handler(value)
 		else:
 			# Call the given domain to handle a value
 			domain = self.domainIndex[value['domain']]

easycoder/__init__.py

@@ -467,12 +467,12 @@ def r_createDialog(self, command, record):
         dialogType = command['type']
         if dialogType in ['lineinput']:
             if dialogType == 'lineinput':
-                input = QLineEdit()
-                mainLayout.addWidget(input)
-        dialog.buttonBox = QDialogButtonBox((QDialogButtonBox.Ok | QDialogButtonBox.Cancel))
-        dialog.buttonBox.accepted.connect(dialog.accept)
-        dialog.buttonBox.rejected.connect(dialog.reject)
-        mainLayout.addWidget(dialog.buttonBox, alignment=Qt.AlignHCenter)
+                dialog.lineEdit = QLineEdit(dialog)
+                mainLayout.addWidget(dialog.lineEdit)
+        buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, dialog)
+        buttonBox.accepted.connect(dialog.accept)
+        buttonBox.rejected.connect(dialog.reject)
+        mainLayout.addWidget(buttonBox, alignment=Qt.AlignHCenter)
         record['dialog'] = dialog
         return self.nextPC()
 
@@ -504,7 +504,7 @@ def r_create(self, command):
 
     # Declare a dialog variable
     def k_dialog(self, command):
-        return self.compileVariable(command)
+        return self.compileVariable(command, 'gui')
 
     def r_dialog(self, command):
         return self.nextPC()
@@ -950,9 +950,9 @@ def r_show(self, command):
             window = self.getVariable(command['window'])['window']
             window.show()
         elif 'dialog' in command:
-            dialog = self.getVariable(command['dialog'])['dialog']
-            result = dialog.exec()
-            # TODO: Finish the dialog box for getting the request relay name
+            record = self.getVariable(command['dialog'])
+            dialog = record['dialog']
+            record['result'] = dialog.exec()
         return self.nextPC()
 
     # Start the graphics
@@ -1071,6 +1071,13 @@ def v_symbol(self, symbolRecord):
             v['type'] = 'boolean'
             v['content'] = content
             return v
+        elif keyword == 'dialog':
+            dialog = symbolRecord['dialog']
+            content = dialog.lineEdit.text() if symbolRecord['result'] == QDialog.Accepted else ''
+            v = {}
+            v['type'] = 'text'
+            v['content'] = content
+            return v
         return None
 
     def v_count(self, v):