X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?p=clnl;a=blobdiff_plain;f=src%2Fmain%2Fmodel.lisp;h=8aa37159b3e70ddec0cd4b228f264a0eec2f8af7;hp=3812ac24cedd5bb9da35ab3d5d9eb4aae118a09f;hb=72aabe5;hpb=213ed30b45140af3f34b7e003aa60394178d524c

diff --git a/src/main/model.lisp b/src/main/model.lisp
index 3812ac2..8aa3715 100644
--- a/src/main/model.lisp
+++ b/src/main/model.lisp
@@ -78,7 +78,8 @@ DESCRIPTION:
     (defstruct ,type
      ,@(remove nil
         (mapcar
-         (lambda (def) (when (find (car def) (list :int :double :boolean :choice :string)) (second def)))
+         (lambda (def)
+          (when (find (car def) (list :int :double :inverted-boolean :boolean :choice :string :option)) (second def)))
          definitions)))
     (push
      (list
@@ -94,6 +95,7 @@ DESCRIPTION:
                (:int `(parse-integer ,line :junk-allowed t))
                (:double `(ignore-errors (coerce (read-from-string ,line) 'double-float)))
                (:boolean `(or (string= "1" ,line) (string= "0" ,line)))
+               (:inverted-boolean `(or (string= "0" ,line) (string= "1" ,line)))
                (:choice `(find ,line ',(mapcar #'car (third def)) :test #'string=)))))
             definitions
             (loop for i to (length definitions) collect i)))))
@@ -109,7 +111,9 @@ DESCRIPTION:
                  (:int `(parse-integer ,line))
                  (:double `(coerce (read-from-string ,line) 'double-float))
                  (:boolean `(string= "1" ,line))
+                 (:inverted-boolean `(string= "0" ,line))
                  (:choice `(cadr (find ,line ',(third def) :key #'car :test #'string=)))
+                 (:option `(when (string/= ,line ,(third def)) ,line))
                  (:string line))))
               (when val-getter (list (intern (symbol-name (cadr def)) :keyword) val-getter))))
             definitions
@@ -144,6 +148,34 @@ DESCRIPTION:
  (:string tick-counter-label)
  (:double frame-rate 30))
 
+(defwidget-definition slider
+ (:specified "SLIDER")
+ (:int left)
+ (:int top)
+ (:int right)
+ (:int bottom)
+ (:string display)
+ (:string varname)
+ (:string min)
+ (:string max)
+ (:double default)
+ (:string step)
+ (:reserved)
+ (:option units "NIL")
+ (:choice direction (("HORIZONTAL" :horizontal) ("VERTICAL" :vertical))))
+
+(defwidget-definition switch
+ (:specified "SWITCH")
+ (:int left)
+ (:int top)
+ (:int right)
+ (:int bottom)
+ (:string display)
+ (:string varname)
+ (:inverted-boolean on)
+ (:reserved)
+ (:reserved))
+
 (defun parse-interface (interface-as-strings)
  (let
   ((widgets-as-strings