[Traverso-commit] traverso resources/fadeshapes.xml src/core/Fade...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    08/02/14 20:40:43

Modified files:
        resources      : fadeshapes.xml 
        src/core       : FadeCurve.cpp 

Log message:
        really fixes bug #22302

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/fadeshapes.xml?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.cpp?cvsroot=traverso&r1=1.34&r2=1.35

Patches:
Index: resources/fadeshapes.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/fadeshapes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- resources/fadeshapes.xml    4 Aug 2006 11:17:21 -0000       1.2
+++ resources/fadeshapes.xml    14 Feb 2008 20:40:42 -0000      1.3
@@ -1,17 +1,17 @@
 <!DOCTYPE FadeShapes>
 <Shapes>
        <FadeIn>
-               <Fastest  mode="0" bendfactor="1" strengthfactor="1" 
controlpoints="0,0;0,1;0,1;1,1" />
-               <Fast mode="0" bendfactor="0.853333" strengthfactor="0.84" 
controlpoints="0,0;0.1232,0.7168;0.2832,0.8768;1,1" />
-               <Linear mode="0" bendfactor="0" strengthfactor="0" 
controlpoints="0,0;0,0;1,1;1,1" />
-               <Slow  mode="0" bendfactor="0.0199997" strengthfactor="0.72" 
controlpoints="0,0;0.7056,0.0143998;0.9856,0.2944;1,1" />
-               <Slowest mode="0" bendfactor="0" strengthfactor="1" 
controlpoints="0,0;1,0;1,0;1,1" />
+               <Fastest  mode="0" bendfactor="0" strengthfactor="0.75" />
+               <Fast mode="0" bendfactor="0" strengthfactor="0.5" />
+               <Linear mode="0" bendfactor="0.5" strengthfactor="0.5" />
+               <Slow  mode="0" bendfactor="1" strengthfactor="0.5" />
+               <Slowest mode="0" bendfactor="1" strengthfactor="0.75" />
        </FadeIn>
        <FadeOut>
-               <Fastest mode="0" bendfactor="0" strengthfactor="1" 
controlpoints="0,0;1,0;1,0;1,1" />
-               <Fast  mode="0" bendfactor="0.0199997" strengthfactor="0.72" 
controlpoints="0,0;0.7056,0.0143998;0.9856,0.2944;1,1" />
-               <Linear mode="0" bendfactor="0" strengthfactor="0" 
controlpoints="0,0;0,0;1,1;1,1" />
-               <Slow mode="0" bendfactor="0.853333" strengthfactor="0.84" 
controlpoints="0,0;0.1232,0.7168;0.2832,0.8768;1,1" />
-               <Slowest  mode="0" bendfactor="1" strengthfactor="1" 
controlpoints="0,0;0,1;0,1;1,1" />
+               <Fastest mode="0" bendfactor="0" strengthfactor="0.75" />
+               <Fast  mode="0" bendfactor="0" strengthfactor="0.5" />
+               <Linear mode="0" bendfactor="0.5" strengthfactor="0.5" />
+               <Slow mode="0" bendfactor="1" strengthfactor="0.5" />
+               <Slowest  mode="0" bendfactor="1" strengthfactor="0.75" />
        </FadeOut>
 </Shapes>
\ No newline at end of file

Index: src/core/FadeCurve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- src/core/FadeCurve.cpp      14 Feb 2008 19:58:42 -0000      1.34
+++ src/core/FadeCurve.cpp      14 Feb 2008 20:40:42 -0000      1.35
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: FadeCurve.cpp,v 1.34 2008/02/14 19:58:42 n_doebelin Exp $
+$Id: FadeCurve.cpp,v 1.35 2008/02/14 20:40:42 n_doebelin Exp $
 */
  
 #include "FadeCurve.h"
@@ -205,7 +205,7 @@
 
 
 void FadeCurve::set_shape(QString shapeName)
-{/*
+{
        QDomDocument doc("FadeShapes");
        
        if (defaultShapes.contains(shapeName)) {
@@ -238,22 +238,13 @@
        
        CommandGroup* group = new CommandGroup(this, tr("Fade Preset"));
        
-       group->add_command(new FadeBend(this, fadeElement.attribute( 
"bendfactor", "0.5" ).toDouble()));
+       group->add_command(new FadeBend(this, fadeElement.attribute( 
"bendfactor", "0.0" ).toDouble()));
        group->add_command(new FadeStrength(this, fadeElement.attribute( 
"strengthfactor", "0.5" ).toDouble()));
        
        Command::process_command(group);
        
-       QStringList controlPointsList = fadeElement.attribute( "controlpoints", 
"" ).split(";");
-       
-       for (int i=0; i<controlPointsList.size(); ++i) {
-               QStringList xyList = controlPointsList.at(i).split(",");
-               float x = xyList.at(0).toFloat();
-               float y = xyList.at(1).toFloat();
-               m_controlPoints[i] = QPointF(x,y);
-       }
-       
        emit stateChanged();
-*/}
+}
 
 void FadeCurve::solve_node_positions( )
 {