sfos/eql5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small revisions and fix of type check;

Browse source
This commit is contained in:
polos 2016-12-09 08:48:27 +01:00
parent 03520bb6ec
commit 09e0f53f28
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Debugging.htm
View file

@ -126,6 +126,9 @@ You might want to put this in your <code>~/.eclrc</code> file:
</pre>
<br>
<p>You may find
<pre> (qproperties object &amp;optional (depth 1))</pre> very convenient for debugging, as it prints the current state of the interesting object.</p>
<br>
<p>In order to automatically switch the REPL to a given package after loading a file, add this line:</p>
<pre> (qlater (lambda () (in-package :my-package)))</pre>
<br>

5
examples/M-modules/multimedia/camera/camera.lisp
View file

@ -103,8 +103,8 @@
(|showMessage| ui:*status-bar* (format nil (tr "Recorded ~D sec") (truncate (/ (|duration| *media-recorder*) 1000)))))
(defun process-captured-image (request-id image)
(qlet ((scaled-image (|scaled(QSize...)| image (|size| ui:*viewfinder*)
|Qt.KeepAspectRatio| |Qt.SmoothTransformation|)))
(qlet ((scaled-image (|scaled| image (|size| ui:*viewfinder*)
|Qt.KeepAspectRatio| |Qt.SmoothTransformation|)))
(|setPixmap| ui:*last-image-preview-label* (|fromImage.QPixmap| scaled-image)))
;; display captured image for 4 seconds
(display-captured-image)
@ -274,6 +274,7 @@
(qconnect ui:*mute-button* "toggled(bool)" 'set-muted)
(qconnect ui:*exposure-compensation* "valueChanged(int)" 'set-exposure-compensation)
(qconnect ui:*action-settings* "triggered()" 'configure-capture-settings)
(qconnect ui:*action-start-camera* "triggered()" 'start-camera)
(qconnect ui:*action-stop-camera* "triggered()" 'stop-camera)
(qconnect ui:*action-exit* "triggered()" ui:*main* "close()")
;; action!

4
src/ecl_fun.cpp
View file

@ -1936,7 +1936,7 @@ cl_object qinvoke_method2(cl_object l_obj, cl_object l_cast, cl_object l_name, c
curr.truncate(curr.length() - 1); }
QByteArray typeName(qtObjectName(cl_car(l_do_args), curr));
bool match = (inherits(typeName, curr) ||
typeName.contains(curr) ||
((curr == "int") ? (typeName == "int") : typeName.contains(curr)) ||
(curr.contains("::") && (typeName == "int")) ||
(curr.contains("QList") && typeName.contains("QList")) ||
(curr.contains("QVector") && typeName.contains("QVector")));
@ -1959,7 +1959,7 @@ ok1:
if(curr.endsWith('*')) {
curr.truncate(curr.length() - 1); }
if(inherits(typeName, curr) ||
typeName.contains(curr) ||
((curr == "int") ? (typeName == "int") : typeName.contains(curr)) ||
(curr.contains("::") && (typeName == "int")) ||
(curr.contains("QList") && typeName.contains("QList")) ||
(curr.contains("QVector") && typeName.contains("QVector"))) {