Merge branch 'workshop' into RB-2.0

.travis.yml

@@ -31,6 +31,8 @@ addons:
     # see http://stackoverflow.com/questions/11302758/error-while-copy-constructing-boostshared-ptr-using-c11
     # we use the irie/boost ppa for that purpose
     - irie-boost
+    # kubuntu-ppa/backports contains OpenCV
+    - kubuntu-ppa-backports
     # the PPA xorg-edgers contains cairo 1.12 (required for rotoscoping)
     - xorg-edgers-ppa
     # ubuntu-toolchain-r/test contains recent versions of gcc
@@ -48,6 +50,23 @@ addons:
     - python-pyside
     - libpyside-dev
     - libshiboken-dev
+  coverity_scan:
+    # customized build script URL
+    # TRAVIS_REPO_SLUG: owner_name/repo_name of repository currently being built
+    # TRAVIS_BRANCH: name of the branch currently being built
+    build_script_url: https://raw.githubusercontent.com/$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/.travis-coverity-scan-build.sh
+    # project metadata
+    project:
+      name: $TRAVIS_REPO_SLUG
+    # Where email notification of build analysis results will be sent
+    notification_email: [email protected]
+    # Commands to prepare for build_command
+    #build_command_prepend: ./configure
+    # This command will be added as an argument to "cov-build" to compile
+    # the project for analysis
+    build_command: "tools/travis/build.sh"
+    # Pattern to match selecting branches that will run analysis
+    branch_pattern: coverity_scan
 
 matrix:
   exclude:
@@ -97,21 +116,3 @@ after_success:
 after_failure:
   - cat install_dependencies.log || true
 
-addons:
-  coverity_scan:
-    # customized build script URL
-    # TRAVIS_REPO_SLUG: owner_name/repo_name of repository currently being built
-    # TRAVIS_BRANCH: name of the branch currently being built
-    build_script_url: https://raw.githubusercontent.com/$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/.travis-coverity-scan-build.sh
-    # project metadata
-    project:
-      name: $TRAVIS_REPO_SLUG
-    # Where email notification of build analysis results will be sent
-    notification_email: [email protected]
-    # Commands to prepare for build_command
-    #build_command_prepend: ./configure
-    # This command will be added as an argument to "cov-build" to compile
-    # the project for analysis
-    build_command: "tools/travis/build.sh"
-    # Pattern to match selecting branches that will run analysis
-    branch_pattern: coverity_scan

App/App.pro

@@ -26,10 +26,12 @@ win32 {
 	CONFIG += app
 }
 CONFIG += moc
-CONFIG += boost glew opengl qt expat cairo python shiboken pyside
+CONFIG += boost glew opengl qt cairo python shiboken pyside
 QT += gui core opengl network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets concurrent
 
+!noexpat: CONFIG += expat
+
 macx {
   ### custom variables for the Info.plist file
   # use a custom Info.plist template

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Nodes group to have cleaner graphs with hidden sub-nodegraphs
 - PyPlug: You can export a  group as a Python plug-in and it be re-used in any other project as a single node as you would use any other plug-in
 - SeExpr integration within a node: http://www.disneyanimation.com/technology/seexpr.html
+- New SeNoise and SeGrain nodes based on SeExpr 
 - RotoPaint node with Wacom tablets support
 - DopeSheet editor: This is where you can control easily keyframes and clips in time for motion graphics purposes
 - Render statistics: Available in the Render menu, use this to debug complex compositions

CrashReporter/CrashDialog.cpp

@@ -119,7 +119,8 @@ CrashDialog::CrashDialog(const QString &filePath)
                            .arg("rgb(21,97,248)") // %7: keyframe value color
                            .arg("rgb(200,200,200)")  // %8: disabled editable text
                            .arg("rgb(180, 200, 100)")  // %9: expression background color
-                           .arg("rgb(150,150,50")); // *10: altered text color
+                           .arg("rgb(150,150,50") // %10: altered text color
+                           .arg("rgb(255,195,120)"));  // %11: mouse over selection color
         }
 
     setWindowTitle(tr("Natron Issue Reporter"));

Documentation/source/PythonReference/NatronEngine/BooleanParam.rst

@@ -53,7 +53,7 @@ Returns the value of the parameter at the current timeline's time.
 .. method:: NatronEngine.BooleanParam.get(frame)
 
 
-    :param frame: :class:`int<PySide.QtCore.int>`
+    :param frame: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`bool<PySide.QtCore.bool>`
 
 Returns the value of the parameter at the given *frame*. This value may be interpolated
@@ -85,7 +85,7 @@ Same as :func:`get()<NatronEngine.BooleanParam.get>`
 .. method:: NatronEngine.BooleanParam.getValueAtTime(time)
 
 
-    :param time: :class:`int<PySide.QtCore.int>`
+    :param time: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`bool<PySide.QtCore.bool>`
 
 Same as :func:`get(frame)<NatronEngine.BooleanParam.get>`

Documentation/source/PythonReference/NatronEngine/ButtonParam.rst

@@ -20,6 +20,7 @@ Functions
 ^^^^^^^^^
 
 *    def :meth:`setIconFilePath<NatronEngine.ButtonParam.setIconFilePath>` (icon)
+*    def :meth:`trigger<NatronEngine.ButtonParam.trigger>` ()
 
 
 Member functions description
@@ -37,5 +38,7 @@ a file-path relative to a path in the NATRON_PLUGIN_PATH.
 
 
 
+.. method:: NatronEngine.ButtonParam.trigger()
 
+Triggers the button action as though the user had pressed it.
 

Documentation/source/PythonReference/NatronEngine/ChoiceParam.rst

@@ -67,7 +67,7 @@ hovers the entry with the mouse.
 .. method:: NatronEngine.ChoiceParam.get(frame)
 
 
-    :param frame: :class:`int<PySide.QtCore.int>`
+    :param frame: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`int<PySide.QtCore.int>`
 
 Get the value of the parameter at the given *frame*.
@@ -130,7 +130,7 @@ Same as :func:`get()<NatronEngine.ChoiceParam.get>`
 .. method:: NatronEngine.ChoiceParam.getValueAtTime(time)
 
 
-    :param time: :class:`int<PySide.QtCore.int>`
+    :param time: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`int<PySide.QtCore.int>`
 
 Same as :func:`get(frame)<NatronEngine.ChoiceParam.get>`

Documentation/source/PythonReference/NatronEngine/ColorParam.rst

@@ -57,7 +57,7 @@ Member functions description
 .. method:: NatronEngine.ColorParam.get(frame)
 
 
-    :param frame: :class:`int<PySide.QtCore.int>`
+    :param frame: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`ColorTuple<NatronEngine.ColorTuple>`
 
 Returns a :doc:`ColorTuple` of the color held by the parameter at the given *frame*.
@@ -150,7 +150,7 @@ Returns the value of this parameter at the given *dimension* at the current time
 .. method:: NatronEngine.ColorParam.getValueAtTime(time[, dimension=0])
 
 
-    :param time: :class:`int<PySide.QtCore.int>`
+    :param time: :class:`float<PySide.QtCore.float>`
     :param dimension: :class:`int<PySide.QtCore.int>`
     :rtype: :class:`float<PySide.QtCore.double>`
 

Documentation/source/PythonReference/NatronEngine/Double2DParam.rst

@@ -48,6 +48,7 @@ timeline's time.
 
 .. method:: NatronEngine.Double2DParam.get(frame)
 
+	:param frame: :class:`float<PySide.QtCore.float>`
 	:rtype: :class:`Double2DTuple`
 
 Returns a :doc:`Double2DTuple` with the [x,y] values for this parameter at the given *frame*.

Documentation/source/PythonReference/NatronEngine/Double3DParam.rst

@@ -34,6 +34,7 @@ timeline's time.
 
 .. method:: NatronEngine.Double3DParam.get(frame)
 
+	:param frame: :class:`float<PySide.QtCore.float>`
 	:rtype: :class:`Double3DTuple`
 
 Returns a :doc:`Double3DTuple` with the [x,y,z] values for this parameter at the given *frame*.

Documentation/source/PythonReference/NatronEngine/DoubleParam.rst

@@ -69,7 +69,7 @@ Member functions description
 .. method:: NatronEngine.DoubleParam.get(frame)
 
 
-    :param frame: :class:`int<PySide.QtCore.int>`
+    :param frame: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`float<PySide.QtCore.double>`
 
 Returns the value of this parameter at the given *frame*. If the animation curve has an 
@@ -165,7 +165,7 @@ Returns the value of this parameter at the given *dimension* at the current time
 .. method:: NatronEngine.DoubleParam.getValueAtTime(time[, dimension=0])
 
 
-    :param time: :class:`int<PySide.QtCore.int>`
+    :param time: :class:`float<PySide.QtCore.float>`
     :param dimension: :class:`int<PySide.QtCore.int>`
     :rtype: :class:`float<PySide.QtCore.double>`
 

Documentation/source/PythonReference/NatronEngine/Effect.rst

@@ -117,16 +117,24 @@ Member functions description
 	Starts a begin/End bracket, blocking all evaluation (=renders and callback onParamChanged) that would be issued due to
 	a call to :func:`setValue<NatronEngine.IntParam.setValue>` on any parameter of the Effect.
 
+	Similarly all input changes will not be evaluated until endChanges() is called.
+
 	Typically to change several values at once we bracket the changes like this::
 	
 		node.beginChanges()	
 		param1.setValue(...)
 		param2.setValue(...)
 		param3.setValue(...)
 		param4.setValue(...)
-		node.endChanges()  # This triggers a new render and a call to the onParamChanged callback
-
+		node.endChanges()  # This triggers a new render 
 
+	A more complex call:
+
+		node.beginChanges()
+		node.connectInput(0,otherNode)
+		node.connectInput(1,thirdNode)
+		param1.setValue(...)
+		node.endChanges() # This triggers a new render
 
 
 .. method:: NatronEngine.Effect.endChanges()
@@ -465,5 +473,7 @@ should not be used.
 Can be called to disable editing of the group via Natron's graphical user interface.
 This is handy to prevent users from accidentally breaking the sub-graph. 
 This can always be reverted by editing the python script associated.
+The user will still be able to see the internal node graph but will not be able to
+unlock it.
 
 

Documentation/source/PythonReference/NatronEngine/Int2DParam.rst

@@ -36,7 +36,7 @@ current time.
 
 .. method:: NatronEngine.Int2DParam.get(frame)
 
-
+	 :param: :class:`float<PySide.QtCore.float>`
      :rtype: :class: `Int2DTuple`
 
 Returns a :doc:`Int2DTuple` containing the [x,y] value of this parameter at

Documentation/source/PythonReference/NatronEngine/Int3DParam.rst

@@ -35,7 +35,7 @@ current time.
 
 .. method:: NatronEngine.Int3DParam.get(frame)
 
-	:param frame: :class:`int`
+	:param frame: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`<Int3DTuple>`
 
 

Documentation/source/PythonReference/NatronEngine/IntParam.rst

@@ -71,7 +71,7 @@ Member functions description
 .. method:: NatronEngine.IntParam.get(frame)
 
 
-    :param frame: :class:`int<PySide.QtCore.int>`
+    :param frame: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`int<PySide.QtCore.int>`
 
 
@@ -173,7 +173,7 @@ Returns the value of this parameter at the given *dimension* at the current time
 .. method:: NatronEngine.IntParam.getValueAtTime(time[, dimension=0])
 
 
-    :param time: :class:`int<PySide.QtCore.int>`
+    :param time: :class:`float<PySide.QtCore.float>`
     :param dimension: :class:`int<PySide.QtCore.int>`
     :rtype: :class:`int<PySide.QtCore.int>`
 

Documentation/source/PythonReference/NatronEngine/StringParamBase.rst

@@ -60,7 +60,7 @@ Get the value of the parameter at the current timeline's time
 .. method:: NatronEngine.StringParamBase.get(frame)
 
 
-    :param frame: :class:`int<PySide.QtCore.int>`
+    :param frame: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`str<NatronEngine.std::string>`
 
 
@@ -94,7 +94,7 @@ Same as :func:`get()<NatronEngine.StringParamBase.get>`
 .. method:: NatronEngine.StringParamBase.getValueAtTime(time)
 
 
-    :param time: :class:`int<PySide.QtCore.int>`
+    :param time: :class:`float<PySide.QtCore.float>`
     :rtype: :class:`str<NatronEngine.std::string>`
 
 Same as :func:`get(frame)<NatronEngine.StringParamBase.get>`

Documentation/source/PythonReference/NatronGui/PyModalDialog.rst

@@ -40,15 +40,15 @@ To create a new :doc:`PyModalDialog`, just use the :func:`createModalDialog()<Na
 	
 	dialog = app1.createModalDialog()
 	
-To show the dialog to the user, use the :func:`exec()<>` function inherited from :class:`QDialog` ::
+To show the dialog to the user, use the :func:`exec_()<>` function inherited from :class:`QDialog` ::
 
-	dialog.exec()
+	dialog.exec_()
 	
-Note that once :func:`exec()<>` is called, no instruction will be executed until the user closed the dialog. 
+Note that once :func:`exec_()<>` is called, no instruction will be executed until the user closed the dialog. 
 
-The modal dialog always has *OK* and *Cancel* buttons. To query which button the user pressed, inspect the return value of the :func:`exec()<>` call::
+The modal dialog always has *OK* and *Cancel* buttons. To query which button the user pressed, inspect the return value of the :func:`exec_()<>` call::
 
-	if dialog.exec():
+	if dialog.exec_():
 		#The user pressed OK
 		...
 	else:
@@ -71,11 +71,11 @@ Once all your parameters are created, create the GUI for them using the :func:`r
 	
 	dialog.refreshUserParamsGUI()
 	
-	dialog.exec()
+	dialog.exec_()
 	
 You can then retrieve the value of a parameter once the dialog is finished using the :func:`getParam(scriptName)<NatronGui.PyModalDialog.getParam>` function::
 
-	if dialog.exec():
+	if dialog.exec_():
 		intValue = dialog.getParam("myInt").get()
 		boolValue = dialog.getParam("myBool").get()