Pārlūkot izejas kodu

more exchange types

johann 5 gadi atpakaļ
vecāks
revīzija
9010e59c47
2 mainītis faili ar 8 papildinājumiem un 4 dzēšanām
  1. 3 3
      lazpaint/lazpaintinstance.pas
  2. 5 1
      scripts/lazpaint/command.py

+ 3 - 3
lazpaint/lazpaintinstance.pas

@@ -615,11 +615,11 @@ begin
         if params.IsReferenceDefined(vRes) then
         begin
           case vRes.variableType of
-          svtFloat: AResult := FloatToStr(params.GetFloat(vRes));
-          svtInteger: AResult := IntToStr(params.GetInteger(vRes));
-          svtBoolean: AResult := BoolToStr(params.GetBoolean(vRes),'True','False');
+          svtFloat, svtInteger, svtBoolean: AResult := params.GetString(vRes);
           svtString: AResult := ScriptQuote(params.GetString(vRes));
           svtPixel: AResult := '"'+BGRAToStr(params.GetPixel(vRes))+'"';
+          svtFloatList..svtPixList: AResult := params.GetString(vRes);
+          svtSubset: AResult := '{'+params.GetSubset(vRes).VariablesAsString+'}';
           end;
         end;
       end else

+ 5 - 1
scripts/lazpaint/command.py

@@ -14,7 +14,11 @@ def send(command, **keywords):
   else:
     print(chr(27) + command + chr(29) + str(keywords))
   if command[-1] == '?':
-    return ast.literal_eval(input(''))
+    result_str =  input('')
+    if result_str[:1] == "#":
+      return result_str
+    else:
+      return ast.literal_eval(result_str)
   else:
     return