Merge branch 'develop' into 'develop'

Develop

See merge request !63

Apps/Examples/CMakeLists.txt

@@ -40,7 +40,7 @@ qt_wrap_cpp( viewer_moc viewer.h )
 add_executable( viewer viewer.cpp ${viewer_moc} ${viewer_ui} )
 target_link_libraries( viewer ${CGoGN_LIBS} ${NUMERICAL_LIBS} ${CGoGN_EXT_LIBS} )
 
-IF (CGoGN_GCC_4_9)
+IF (HAS_CPP11_REGEX)
 	qt_wrap_ui( clipping_ui clipping.ui )
 	qt_wrap_cpp( clipping_moc clipping.h )
 	add_executable( clipping clipping.cpp ${clipping_ui} ${clipping_moc} )

CGoGN/include/Algo/Modelisation/subdivision.h

@@ -94,6 +94,12 @@ void quadranguleFaces(typename PFP::MAP& map, EMBV& attributs) ;
 template <typename PFP, typename EMBV>
 void CatmullClarkSubdivision(typename PFP::MAP& map, EMBV& attributs) ;
 
+/**
+* Interpolant Catmull-Clark subdivision scheme
+*/
+template <typename PFP, typename EMBV>
+void CatmullClarkInterpolSubdivision(typename PFP::MAP& map, EMBV& attributs);
+
 /**
  * Loop subdivision scheme
  */

CGoGN/include/Algo/Render/GL2/mapRender.hpp

@@ -536,8 +536,11 @@ void MapRender::initPrimitives(typename PFP::MAP& map, int prim, const VertexAtt
 	m_indexBufferUpToDate[prim] = true;
 
 	// setup du buffer d'indices
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_indexBuffers[prim]);
-	glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_nbIndices[prim] * sizeof(GLuint), &(tableIndices[0]), GL_STREAM_DRAW);
+	if (m_nbIndices[prim] > 0)
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_indexBuffers[prim]);
+		glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_nbIndices[prim] * sizeof(GLuint), &(tableIndices[0]), GL_STREAM_DRAW);
+	}
 }
 
 template <typename PFP>

CGoGN/include/Utils/Shaders/shaderRadiancePerVertexInterp.frag

@@ -75,7 +75,7 @@ void set_eval_direction (vec3 v)
 
 void main (void)
 {
-        int size = (textureSize(texture,0)).x; // supposed square matrix
+	int size = (textureSize(texture,0)).x; // supposed square matrix
 
 	vec3 eyeV = normalize(camera - vxPos); // normalized outgoing line-of-sight vector
 	eyeV = 2*dot(vxNorm,eyeV)*vxNorm-eyeV ; // symmetrize

CGoGN/include/Utils/Shaders/shaderSimpleColor.h

@@ -67,6 +67,9 @@ public:
 	unsigned int setAttributePosition(VBO* vbo);
 
 	void setClippingPlane(const Geom::Vec4f& plane);
+
+	inline void setNoClippingPlane() { setClippingPlane(Geom::Vec4f(0.0f,0.0f,0.0f,0.0f)); }
+
 };
 
 } // namespace Utils

CGoGN/src/Utils/GLSLShader.cpp

@@ -39,41 +39,43 @@ namespace CGoGN
 namespace Utils
 {
 
-#ifdef CGOGN_USE_OGL_CORE_PROFILE
-unsigned int GLSLShader::CURRENT_OGL_VERSION = 3;
-unsigned int GLSLShader::MAJOR_OGL_CORE = 3;
-unsigned int GLSLShader::MINOR_OGL_CORE = 3;
-#else
-unsigned int GLSLShader::CURRENT_OGL_VERSION = 2;
-unsigned int GLSLShader::MAJOR_OGL_CORE = 2;
-unsigned int GLSLShader::MINOR_OGL_CORE = 1;
-#endif
-
-std::string GLSLShader::DEFINES_GL2=\
-"#version 110\n"
-"#define PRECISION float pipo_PRECISION\n"
-"#define ATTRIBUTE attribute\n"
-"#define VARYING_VERT varying\n"
-"#define VARYING_FRAG varying\n"
-"#define FRAG_OUT_DEF float pipo_FRAGDEF\n"
-"#define FRAG_OUT gl_FragColor\n"
-"#define INVARIANT_POS float pipo_INVARIANT\n"
-"#define TEXTURE2D texture2D\n"
-;
-
-std::string GLSLShader::DEFINES_GL3=\
-"#version 330\n"
-"#define PRECISION precision highp float\n"
-"#define ATTRIBUTE in\n"
-"#define VARYING_VERT out\n"
-"#define VARYING_FRAG in\n"
-"#define FRAG_OUT_DEF out vec4 outFragColor\n"
-"#define FRAG_OUT outFragColor\n"
-"#define INVARIANT_POS invariant gl_Position\n"
-"#define TEXTURE2D texture\n"
-;
-
-std::string* GLSLShader::DEFINES_GL = NULL;
+//#ifdef CGOGN_USE_OGL_CORE_PROFILE
+//unsigned int GLSLShader::CURRENT_OGL_VERSION = 3;
+//unsigned int GLSLShader::MAJOR_OGL_CORE = 3;
+//unsigned int GLSLShader::MINOR_OGL_CORE = 3;
+//#else
+//unsigned int GLSLShader::CURRENT_OGL_VERSION = 2;
+//unsigned int GLSLShader::MAJOR_OGL_CORE = 2;
+//unsigned int GLSLShader::MINOR_OGL_CORE = 1;
+//#endif
+
+
+
+//std::string GLSLShader::DEFINES_GL2=\
+//"#version 110\n"
+//"#define PRECISION float pipo_PRECISION\n"
+//"#define ATTRIBUTE attribute\n"
+//"#define VARYING_VERT varying\n"
+//"#define VARYING_FRAG varying\n"
+//"#define FRAG_OUT_DEF float pipo_FRAGDEF\n"
+//"#define FRAG_OUT gl_FragColor\n"
+//"#define INVARIANT_POS float pipo_INVARIANT\n"
+//"#define TEXTURE2D texture2D\n";
+
+
+//std::string GLSLShader::DEFINES_GL3=\
+//"#version 150\n"
+//"#define PRECISION precision highp float\n"
+//"#define ATTRIBUTE in\n"
+//"#define VARYING_VERT out\n"
+//"#define VARYING_FRAG in\n"
+//"#define FRAG_OUT_DEF out vec4 outFragColor\n"
+//"#define FRAG_OUT outFragColor\n"
+//"#define INVARIANT_POS invariant gl_Position\n"
+//"#define TEXTURE2D texture\n";
+
+
+//std::string* GLSLShader::DEFINES_GL = NULL;
 
 std::vector<std::string> GLSLShader::m_pathes;
 

CGoGN/src/Utils/Shaders/shaderPhong.cpp

@@ -21,7 +21,6 @@
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/
-
 #define CGoGN_UTILS_DLL_EXPORT 1
 #include <GL/glew.h>
 #include "Utils/Shaders/shaderPhong.h"
@@ -37,6 +36,7 @@ namespace Utils
 #include "shaderPhongClip.vert"
 #include "shaderPhongClip.frag"
 
+
 ShaderPhong::ShaderPhong(bool withClipping, bool doubleSided, bool withEyePosition):
 	m_with_color(false),
 	m_with_eyepos(withEyePosition),
@@ -54,17 +54,30 @@ ShaderPhong::ShaderPhong(bool withClipping, bool doubleSided, bool withEyePositi
 	std::string glxvert(GLSLShader::defines_gl());
 	std::string glxfrag(GLSLShader::defines_gl());
 
-	// get choose GL defines (2 or 3)
-	// ans compile shaders
-	std::string glxvert(GLSLShader::defines_gl());
-	if (m_with_eyepos)
-		glxvert.append("#define WITH_EYEPOSITION");
-	glxvert.append(vertexShaderText);
-	std::string glxfrag(GLSLShader::defines_gl());
-	// Use double sided lighting if set
-	if (doubleSided)
-		glxfrag.append("#define DOUBLE_SIDED\n");
-	glxfrag.append(fragmentShaderText);
+	if (withClipping)
+	{
+		m_nameVS = "ShaderPhongClip_vs";
+		m_nameFS = "ShaderPhongClip_fs";
+		if (m_with_eyepos)
+			glxvert.append("#define WITH_EYEPOSITION");
+		glxvert.append(vertexShaderClipText);
+		// Use double sided lighting if set
+		if (doubleSided)
+			glxfrag.append("#define DOUBLE_SIDED\n");
+		glxfrag.append(fragmentShaderClipText);
+	}
+	else
+	{
+		m_nameVS = "ShaderPhong_vs";
+		m_nameFS = "ShaderPhong_fs";
+		if (m_with_eyepos)
+			glxvert.append("#define WITH_EYEPOSITION");
+		glxvert.append(vertexShaderText);
+		// Use double sided lighting if set
+		if (doubleSided)
+			glxfrag.append("#define DOUBLE_SIDED\n");
+		glxfrag.append(fragmentShaderText);
+	}
 
 	loadShadersFromMemory(glxvert.c_str(), glxfrag.c_str());
 

CGoGN/src/Utils/Shaders/shaderSimpleFlat.cpp

@@ -21,7 +21,6 @@
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/
-
 #define CGoGN_UTILS_DLL_EXPORT 1
 #include <GL/glew.h>
 #include "Utils/Shaders/shaderSimpleFlat.h"
@@ -37,6 +36,8 @@ namespace Utils
 #include "shaderSimpleFlatClip.vert"
 #include "shaderSimpleFlatClip.frag"
 
+
+
 ShaderSimpleFlat::ShaderSimpleFlat(bool withClipping, bool doubleSided):
 	m_with_color(false),
 	m_ambiant(Geom::Vec4f(0.05f,0.05f,0.1f,0.0f)),
@@ -47,18 +48,8 @@ ShaderSimpleFlat::ShaderSimpleFlat(bool withClipping, bool doubleSided):
 	m_vboColor(NULL),
 	m_planeClip(Geom::Vec4f(0.0f,0.0f,0.0f,0.0f))
 {
-	m_nameVS = "ShaderSimpleFlat_vs";
-	m_nameFS = "ShaderSimpleFlat_fs";
-//	m_nameGS = "ShaderSimpleFlat_gs";
-
-	// get choose GL defines (2 or 3)
-	// ans compile shaders
 	std::string glxvert(GLSLShader::defines_gl());
-	glxvert.append(vertexShaderText);
 	std::string glxfrag(GLSLShader::defines_gl());
-	if (doubleSided)
-		glxfrag.append("#define DOUBLE_SIDED\n");
-	glxfrag.append(fragmentShaderText);
 
 	if (withClipping)
 	{
@@ -126,6 +117,7 @@ void ShaderSimpleFlat::setDiffuse(const Geom::Vec4f& diffuse)
 	unbind();
 }
 
+
 void ShaderSimpleFlat::setLightPosition(const Geom::Vec3f& lightPos)
 {
 	bind();
@@ -134,6 +126,7 @@ void ShaderSimpleFlat::setLightPosition(const Geom::Vec3f& lightPos)
 	unbind();
 }
 
+
 void ShaderSimpleFlat::setBackColor(const Geom::Vec4f& back)
 {
 	bind();
@@ -142,6 +135,7 @@ void ShaderSimpleFlat::setBackColor(const Geom::Vec4f& back)
 	unbind();
 }
 
+
 void ShaderSimpleFlat::setParams(const Geom::Vec4f& ambiant, const Geom::Vec4f& diffuse, const Geom::Vec3f& lightPos)
 {
 	m_ambiant = ambiant;
@@ -231,6 +225,8 @@ void ShaderSimpleFlat::setClippingPlane(const Geom::Vec4f& plane)
 	}
 }
 
+
+
 } // namespace Utils
 
 } // namespace CGoGN

CGoGN/src/Utils/shaderMutator.cpp

@@ -46,8 +46,6 @@ namespace Utils
  *
  ***********************************************/
 
-#ifdef CGOGN_GCC_4_9
-
 
 ShaderMutator::ShaderMutator(const std:: string& shaderName, const std::string& vertShaderSrc, const std::string& fragShaderSrc, const std::string& geomShaderSrc)
 {
@@ -790,106 +788,6 @@ bool ShaderMutator::srcInsertCodeAtMainFunctionEnd(const std::string& insertedCo
 	return true;
 }
 
-#else
-
-
-ShaderMutator::ShaderMutator(const std:: string& /*shaderName*/, const std::string& /*vertShaderSrc*/, const std::string& /*fragShaderSrc*/, const std::string& /*geomShaderSrc*/)
-{
-}
-
-bool ShaderMutator::containsVariableDeclaration(shaderSrcType /*srcType*/, const std::string& /*variableName*/)
-{
-	bool result = false;
-	return result;
-}
-
-bool ShaderMutator::setMinShadingLanguageVersion(shaderSrcType /*srcType*/, int /*version*/)
-{
-	bool result = false;
-	return result;
-}
-
-bool ShaderMutator::changeIntConstantValue(shaderSrcType /*srcType*/, const std::string& /*constantName*/, int /*newVal*/)
-{
-	return true;
-}
-
-bool ShaderMutator::changeFloatConstantValue(shaderSrcType /*srcType*/, const std::string& /*constantName*/, float /*newVal*/)
-{
-	return true;
-}
-
-bool ShaderMutator::insertCodeBeforeMainFunction(shaderSrcType /*srcType*/, const std::string& /*insertedCode*/)
-{
-	return true;
-}
-
-bool ShaderMutator::insertCodeAtMainFunctionBeginning(shaderSrcType /*srcType*/, const std::string& /*insertedCode*/)
-{
-	return true;
-}
-
-bool ShaderMutator::insertCodeAtMainFunctionEnd(shaderSrcType /*srcType*/, const std::string& /*insertedCode*/)
-{
-	return true;
-}
-
-
-/***********************************************
- *
- * 		Private Section
- *
- ***********************************************/
-
-
-bool ShaderMutator::srcIsCommented(size_t /*pos*/, const std::string& /*src*/)
-{
-	return false;
-}
-
-bool ShaderMutator::srcIsOneLineCommented(size_t /*pos*/, const std::string& /*src*/)
-{
-	return false;
-}
-
-bool ShaderMutator::srcContainsVariableDeclaration(const std::string& /*variableName*/, std::string& /*src*/)
-{
-	return false;
-}
-
-bool ShaderMutator::srcSetMinShadingLanguageVersion(int /*version*/, std::string& /*modifiedSrc*/)
-{
-	return true;
-}
-
-bool ShaderMutator::srcChangeIntConstantValue(int /*newVal*/, const std::string& /*constantName*/, std::string& /*modifiedSrc*/)
-{
-	return false;
-}
-
-bool ShaderMutator::srcChangeFloatConstantValue(float /*newVal*/, const std::string& /*constantName*/, std::string& /*modifiedSrc*/)
-{
-	return false;
-}
-
-bool ShaderMutator::srcInsertCodeBeforeMainFunction(const std::string& /*insertedCode*/, std::string& /*modifiedSrc*/)
-{
-	return false;
-}
-
-bool ShaderMutator::srcInsertCodeAtMainFunctionBeginning(const std::string& /*insertedCode*/, std::string& /*modifiedSrc*/)
-{
-	return false;
-}
-
-bool ShaderMutator::srcInsertCodeAtMainFunctionEnd(const std::string& /*insertedCode*/, std::string& /*modifiedSrc*/)
-{
-	return true;
-}
-
-
-#endif
-
 } // namespace Utils
 
 } // namespace CGoGN

CMakeLists.txt

@@ -35,12 +35,6 @@ IF (WIN32)
 	SET ( CGoGN_WITH_QTCREATOR OFF CACHE BOOL "use QtCreator to compile (Experimental" )
 ENDIF()
 
-IF (LINUX)
-	SET ( CGoGN_GCC_4_9 OFF CACHE BOOL "using gcc version > 4.9 (std::regex ok !)" )
-ENDIF()
-
-SET ( BUILD_SHARED_LIBS ON CACHE BOOL "if used all library are build as shared type (.so/.dylib/.dll)" )
-
 
 checkCpp11Support()
 checkCpp11Feature("regex" HAS_CPP11_REGEX "False")
@@ -172,8 +166,12 @@ IF(WIN32)
 ENDIF ()
 
 
-IF (CGoGN_GCC_4_9)
-	LIST(APPEND CGoGN_DEFS -DCGOGN_GCC_4_9)
+IF (APPLE)
+	LIST(APPEND CGoGN_DEFS -DCGOGN_APPLE)
+ENDIF ()
+
+IF (HAS_CPP11_REGEX)
+	LIST(APPEND CGoGN_DEFS -DHAS_CPP11_REGEX)
 ENDIF ()
 
 

SCHNApps/Plugins/CMakeLists.txt

@@ -28,7 +28,7 @@ ADD_SUBDIRECTORY(surface_modelisation)
 ADD_SUBDIRECTORY(surface_distance)
 ADD_SUBDIRECTORY(surface_radiance)
 
-ADD_SUBDIRECTORY(cage2D_deformation)
+#ADD_SUBDIRECTORY(cage2D_deformation)
 
 ADD_SUBDIRECTORY(volume_import)
 #ADD_SUBDIRECTORY(volume_render)

SCHNApps/Plugins/surface_import/src/surface_import.cpp

@@ -36,7 +36,7 @@ MapHandlerGen* Surface_Import_Plugin::importMeshFromFile(const QString& fileName
 	QFileInfo fi(fileName);
 	if(fi.exists())
 	{
-		pythonRecording("importFromFile", fi.baseName(), fileName);
+		pythonRecording("importMeshFromFile", fi.baseName(), fileName);
 
 		MapHandlerGen* mhg = m_schnapps->addMap(fi.baseName(), 2);
 		if(mhg)
@@ -80,6 +80,8 @@ MapHandlerGen* Surface_Import_Plugin::importImageFromFile(const QString& fileNam
 	QFileInfo fi(fileName);
 	if(fi.exists())
 	{
+		pythonRecording("importImageFromFile", fi.baseName(), fileName);
+
 		MapHandlerGen* mhg = m_schnapps->addMap(fi.baseName(), 2);
 		if(mhg)
 		{

SCHNApps/include/mapHandler.hpp

@@ -120,46 +120,51 @@ void MapHandler<PFP>::updateBB()
 template <typename PFP>
 void MapHandler<PFP>::updateBBDrawer()
 {
-	if (!m_bb.isInitialized())
-		return;
-
 	if (!m_bbDrawer)
 		m_bbDrawer = new Utils::Drawer();
 
-	Geom::Vec3f bbmin = m_bb.min();
-	Geom::Vec3f bbmax = m_bb.max();
-	float shift = 0.005f * (bbmax - bbmin).norm();
-	bbmin -= Geom::Vec3f(shift, shift, shift);
-	bbmax += Geom::Vec3f(shift, shift, shift);
-
-	m_bbDrawer->newList(GL_COMPILE);
-	m_bbDrawer->color3f(0.0f,1.0f,0.0f);
-	m_bbDrawer->lineWidth(1.0f);
-	m_bbDrawer->begin(GL_LINE_LOOP);
-	m_bbDrawer->vertex(bbmin);
-	m_bbDrawer->vertex3f(bbmin[0], bbmax[1], bbmin[2]);
-	m_bbDrawer->vertex3f(bbmax[0], bbmax[1], bbmin[2]);
-	m_bbDrawer->vertex3f(bbmax[0], bbmin[1], bbmin[2]);
-	m_bbDrawer->vertex(bbmin);
-	m_bbDrawer->end();
-	m_bbDrawer->begin(GL_LINE_LOOP);
-	m_bbDrawer->vertex(bbmax);
-	m_bbDrawer->vertex3f(bbmax[0], bbmin[1], bbmax[2]);
-	m_bbDrawer->vertex3f(bbmin[0], bbmin[1], bbmax[2]);
-	m_bbDrawer->vertex3f(bbmin[0], bbmax[1], bbmax[2]);
-	m_bbDrawer->vertex(bbmax);
-	m_bbDrawer->end();
-	m_bbDrawer->begin(GL_LINES);
-	m_bbDrawer->vertex(bbmin);
-	m_bbDrawer->vertex3f(bbmin[0], bbmin[1], bbmax[2]);
-	m_bbDrawer->vertex3f(bbmin[0], bbmax[1], bbmin[2]);
-	m_bbDrawer->vertex3f(bbmin[0], bbmax[1], bbmax[2]);
-	m_bbDrawer->vertex3f(bbmax[0], bbmax[1], bbmin[2]);
-	m_bbDrawer->vertex(bbmax);
-	m_bbDrawer->vertex3f(bbmax[0], bbmin[1], bbmin[2]);
-	m_bbDrawer->vertex3f(bbmax[0], bbmin[1], bbmax[2]);
-	m_bbDrawer->end();
-	m_bbDrawer->endList();
+	if (m_bb.isInitialized())
+	{
+		Geom::Vec3f bbmin = m_bb.min();
+		Geom::Vec3f bbmax = m_bb.max();
+		float shift = 0.005f * (bbmax - bbmin).norm();
+		bbmin -= Geom::Vec3f(shift, shift, shift);
+		bbmax += Geom::Vec3f(shift, shift, shift);
+
+		m_bbDrawer->newList(GL_COMPILE);
+		m_bbDrawer->color3f(0.0f, 1.0f, 0.0f);
+		m_bbDrawer->lineWidth(1.0f);
+		m_bbDrawer->begin(GL_LINE_LOOP);
+		m_bbDrawer->vertex(bbmin);
+		m_bbDrawer->vertex3f(bbmin[0], bbmax[1], bbmin[2]);
+		m_bbDrawer->vertex3f(bbmax[0], bbmax[1], bbmin[2]);
+		m_bbDrawer->vertex3f(bbmax[0], bbmin[1], bbmin[2]);
+		m_bbDrawer->vertex(bbmin);
+		m_bbDrawer->end();
+		m_bbDrawer->begin(GL_LINE_LOOP);
+		m_bbDrawer->vertex(bbmax);
+		m_bbDrawer->vertex3f(bbmax[0], bbmin[1], bbmax[2]);
+		m_bbDrawer->vertex3f(bbmin[0], bbmin[1], bbmax[2]);
+		m_bbDrawer->vertex3f(bbmin[0], bbmax[1], bbmax[2]);
+		m_bbDrawer->vertex(bbmax);
+		m_bbDrawer->end();
+		m_bbDrawer->begin(GL_LINES);
+		m_bbDrawer->vertex(bbmin);
+		m_bbDrawer->vertex3f(bbmin[0], bbmin[1], bbmax[2]);
+		m_bbDrawer->vertex3f(bbmin[0], bbmax[1], bbmin[2]);
+		m_bbDrawer->vertex3f(bbmin[0], bbmax[1], bbmax[2]);
+		m_bbDrawer->vertex3f(bbmax[0], bbmax[1], bbmin[2]);
+		m_bbDrawer->vertex(bbmax);
+		m_bbDrawer->vertex3f(bbmax[0], bbmin[1], bbmin[2]);
+		m_bbDrawer->vertex3f(bbmax[0], bbmin[1], bbmax[2]);
+		m_bbDrawer->end();
+		m_bbDrawer->endList();
+	}
+	else
+	{
+		m_bbDrawer->newList();
+		m_bbDrawer->endList();
+	}
 }
 
 template <typename PFP>

SCHNApps/include/plugin.h

@@ -96,7 +96,10 @@ void Plugin::pythonRecording(QString slotName, QString returned, T1 param1)
 	if (rec)
 	{
 		if (!returned.isEmpty())
+		{
+			m_schnapps->pythonVarDeclare(returned);
 			*rec << returned << " = ";
+		}
 		*rec << this->getName() << "." << slotName << "(" << pyR_stringify(param1) << ");" << endl;
 	}
 }
@@ -108,7 +111,10 @@ void Plugin::pythonRecording(QString slotName, QString returned, T1 param1, T2 p
 	if (rec)
 	{
 		if (!returned.isEmpty())
+		{
+			m_schnapps->pythonVarDeclare(returned);
 			*rec << returned << " = ";
+		}
 		*rec << this->getName() << "." << slotName << "(" << pyR_stringify(param1) << ", " << pyR_stringify(param2) << ");" << endl;
 	}
 }
@@ -120,7 +126,10 @@ void Plugin::pythonRecording(QString slotName, QString returned, T1 param1, T2 p
 	if (rec)
 	{
 		if (!returned.isEmpty())
+		{
+			m_schnapps->pythonVarDeclare(returned);
 			*rec << returned << " = ";
+		}
 		*rec << this->getName() << "." << slotName << "(" << pyR_stringify(param1) << ", " << pyR_stringify(param2) << ", " << pyR_stringify(param3) << ");" << endl;
 	}
 }
@@ -133,7 +142,10 @@ void Plugin::pythonRecording(QString slotName, QString returned, T1 param1, T2 p
 	if (rec)
 	{
 		if (!returned.isEmpty())
+		{
+			m_schnapps->pythonVarDeclare(returned);
 			*rec << returned << " = ";
+		}
 		*rec << this->getName() << "." << slotName << "(" << pyR_stringify(param1) << ", " << pyR_stringify(param2) << ", " << pyR_stringify(param3) << ", " << pyR_stringify(param4) << ");" << endl;
 	}
 }
@@ -145,7 +157,10 @@ void Plugin::pythonRecording(QString slotName, QString returned, T1 param1, T2 p
 	if (rec)
 	{
 		if (!returned.isEmpty())
+		{
+			m_schnapps->pythonVarDeclare(returned);
 			*rec << returned << " = ";
+		}
 		*rec << this->getName() << "." << slotName << "(" << pyR_stringify(param1) << ", " << pyR_stringify(param2) << ", ";
 		*rec << pyR_stringify(param3) << ", " << pyR_stringify(param4) << ", " << pyR_stringify(param5) << ");" << endl;
 	}
@@ -159,7 +174,10 @@ void Plugin::pythonRecording(QString slotName, QString returned, T1 param1, T2 p
 	if (rec)
 	{
 		if (!returned.isEmpty())
+		{
+			m_schnapps->pythonVarDeclare(returned);
 			*rec << returned << " = ";
+		}
 		*rec << this->getName() << "." << slotName << "(" << pyR_stringify(param1) << ", " << pyR_stringify(param2) << ", ";
 		*rec << pyR_stringify(param3) << ", " << pyR_stringify(param4) << ", " << pyR_stringify(param5) << ", " << pyR_stringify(param6)  << ");" << endl;
 	}
@@ -174,7 +192,10 @@ void Plugin::pythonRecording(QString slotName, QString returned, T1 param1, T2 p
 	if (rec)
 	{
 		if (!returned.isEmpty())
+		{
+			m_schnapps->pythonVarDeclare(returned);
 			*rec << returned << " = ";
+		}
 		*rec << this->getName() << "." << slotName << "(" << pyR_stringify(param1) << ", " << pyR_stringify(param2) << ", ";
 		*rec << pyR_stringify(param3) << ", " << pyR_stringify(param4) << ", " << pyR_stringify(param5) << ", ";
 		*rec << pyR_stringify(param6) << ", " << pyR_stringify(param7) << ", " << pyR_stringify(param8) << ", ";

SCHNApps/include/schnapps.h

@@ -129,8 +129,6 @@ public:
 	void addMenuAction(Plugin* plugin, const QString& menuPath, QAction* action);
 	void removeMenuAction(Plugin* plugin, QAction* action);
 
-	void statusBarMessage(const QString& msg, int msec);
-
 public slots:
 	void aboutSCHNApps();
 	void aboutCGoGN();
@@ -141,6 +139,13 @@ public slots:
 
 	void loadPythonScriptFromFile(const QString& fileName);
 
+	void statusBarMessage(const QString& msg, int msec);
+
+	QString openFileDialog(const QString& title, const QString& dir = QString(), const QString& filter = QString());
+
+	QString saveFileDialog(const QString& title, const QString& dir = QString(), const QString& filter = QString());
+
+
 private slots:
 	void loadPythonScriptFromFileDialog();
 
@@ -151,6 +156,8 @@ private slots:
 protected:
 	QTextStream* m_pyRecording;
 	QFile* m_pyRecFile;
+	QList<QString> m_pyVarNames;
+	QString m_pyBuffer;
 
 private slots:
 	void beginPyRecording();
@@ -159,7 +166,8 @@ private slots:
 
 public:
 	inline QTextStream* pythonStreamRecorder()  { return m_pyRecording; }
-
+	inline void pythonVarDeclare(const QString& var) { m_pyVarNames.push_back(var); }
+	inline void pythonVarsClear() { m_pyVarNames.clear(); }
 
 signals:
 	void cameraAdded(Camera* camera);

SCHNApps/src/schnapps.cpp

@@ -839,7 +839,11 @@ void SCHNApps::beginPyRecording()
 	if (m_pyRecording != NULL) //  WRITE & CLOSE
 	{
 		QTextStream out(m_pyRecFile);
-		out << m_pyRecording->readAll();
+		foreach(QString var, m_pyVarNames)
+		{
+			m_pyBuffer.replace("\"" + var + "\"", var + ".getName()");
+		}
+		out << m_pyBuffer << endl;
 		m_pyRecFile->close();
 
 		delete m_pyRecording;
@@ -856,7 +860,10 @@ void SCHNApps::beginPyRecording()
 		m_pyRecFile = new QFile(fileName);
 		if (!m_pyRecFile->open(QIODevice::WriteOnly | QIODevice::Text))
 			return;
-		m_pyRecording = new QTextStream(m_pyRecFile);
+
+		m_pyBuffer.clear();
+		m_pyRecording = new QTextStream(&m_pyBuffer);
+		
 
 		foreach(View *v, m_views)
 			*m_pyRecording << v->getName() << " = schnapps.getView(\"" << v->getName() << "\");" << endl;
@@ -865,6 +872,7 @@ void SCHNApps::beginPyRecording()
 			*m_pyRecording << m->getName() << " = schnapps.getMap(\"" << m->getName() << "\");" << endl;
 
 		statusbar->showMessage(QString(" Recording python in ") + fileName);
+		pythonVarsClear();
 	}
 	else
 	{
@@ -880,7 +888,11 @@ void SCHNApps::appendPyRecording()
 	if (m_pyRecording != NULL)	//  WRITE & CLOSE