yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2580
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Tue 2010-11-30 16:41:55 +0100
message:
  1. qt4 is "on" by default
  2. Syntax fix in documentation.
  3. export.text is disabled in regular-sphere-pack example
modified:
  SConstruct
  doc/sphinx/installation.rst
  examples/regular-sphere-pack/regular-sphere-pack.py


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2010-11-30 13:51:41 +0000
+++ SConstruct	2010-11-30 15:41:55 +0000
@@ -92,7 +92,7 @@
 	BoolVariable('gprof','Enable profiling information for gprof',0),
 	('optimize','Turn on optimizations (-1, 0 or 1); negative value sets optimization based on debugging: not optimize with debugging and vice versa.',-1,None,int),
 	EnumVariable('PGO','Whether to "gen"erate or "use" Profile-Guided Optimization','',['','gen','use'],{'no':'','0':'','false':''},1),
-	ListVariable('features','Optional features that are turned on','log4cxx,opengl,gts,openmp,vtk',names=['opengl','log4cxx','cgal','openmp','gts','vtk','gl2ps','devirt-functors','qt4','never_use_this_one','subdomains']),
+	ListVariable('features','Optional features that are turned on','log4cxx,opengl,gts,openmp,vtk,qt4',names=['opengl','log4cxx','cgal','openmp','gts','vtk','gl2ps','devirt-functors','qt4','never_use_this_one','subdomains']),
 	('jobs','Number of jobs to run at the same time (same as -j, but saved)',2,None,int),
 	#('extraModules', 'Extra directories with their own SConscript files (must be in-tree) (whitespace separated)',None,None,Split),
 	('buildPrefix','Where to create build-[version][variant] directory for intermediary files','..'),

=== modified file 'doc/sphinx/installation.rst'
--- doc/sphinx/installation.rst	2010-09-12 16:52:20 +0000
+++ doc/sphinx/installation.rst	2010-11-30 15:41:55 +0000
@@ -65,6 +65,7 @@
 	libqglviewer-qt4-dev
 
 command line (cut&paste to the terminal under root privileges) for Fedora (not good tested yet!)::
+
 	yum install scons qt3-devel freeglut-devel boost-devel boost-date-time \
 	boost-filesystem boost-thread boost-regex fakeroot gcc gcc-c++ boost-iostreams \
 	log4cxx log4cxx-devel python-devel boost-python ipython python-matplotlib \

=== modified file 'examples/regular-sphere-pack/regular-sphere-pack.py'
--- examples/regular-sphere-pack/regular-sphere-pack.py	2010-11-22 17:58:56 +0000
+++ examples/regular-sphere-pack/regular-sphere-pack.py	2010-11-30 15:41:55 +0000
@@ -68,8 +68,8 @@
 oriBody = Quaternion(Vector3(0,0,1),(3.14159/2))
 O.bodies.append(ymport.gengeoFile('regular-sphere-pack-LSMGenGeo.geo',shift=Vector3(-7.0,-7.0,-5.9),scale=1.0,orientation=oriBody,color=(1,0,1),**kw))
 
-# spheresToFile saves coordinates and radii of all spheres of the simulation into the text file
-print "Saved into the OutFile " + str (export.text("OutFile")) + " spheres";
+# spheresToFile saves coordinates and radii of all spheres of the simulation into the text file, works but disabled. Please, uncomment it, if you need
+#print "Saved into the OutFile " + str (export.text("OutFile")) + " spheres";
 
 # spheresFromFile function imports coordinates and radiuses of all spheres of the simulation into the text file
 O.bodies.append(ymport.text('regular-sphere-pack-FromFile',shift=Vector3(6.0,6.0,-2.9),scale=0.7,color=(1,1,1),**kw))