canorus-commit — Canorus Subversion Commit Mailing List

[Canorus-commit] SF.net SVN: canorus:[1322] trunk/src/score/ritardando.cpp

[<su...@us...>]

Revision: 1322
          http://canorus.svn.sourceforge.net/canorus/?rev=1322&view=rev
Author:   suamor
Date:     2012-09-01 19:11:10 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes:
Return Ritardando in ritardandoTypeFromString for unknown strings

Modified Paths:
--------------
    trunk/src/score/ritardando.cpp

Modified: trunk/src/score/ritardando.cpp
===================================================================
--- trunk/src/score/ritardando.cpp	2012-09-01 19:10:20 UTC (rev 1321)
+++ trunk/src/score/ritardando.cpp	2012-09-01 19:11:10 UTC (rev 1322)
@@ -56,6 +56,7 @@
 	case Accellerando:
 		return "Accellerando";
 	}
+	return "Ritardando";
 }
 
 CARitardando::CARitardandoType CARitardando::ritardandoTypeFromString( const QString r ) {
@@ -65,4 +66,6 @@
 	if (r=="Accellerando") {
 		return Accellerando;
 	}
+	return Ritardando;
 }
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1321] trunk/src/score/repeatmark.cpp

[<su...@us...>]

Revision: 1321
          http://canorus.svn.sourceforge.net/canorus/?rev=1321&view=rev
Author:   suamor
Date:     2012-09-01 19:10:20 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Return Undefined in repeatMarkTypeFromString for unknown strings

Modified Paths:
--------------
    trunk/src/score/repeatmark.cpp

Modified: trunk/src/score/repeatmark.cpp
===================================================================
--- trunk/src/score/repeatmark.cpp	2012-09-01 19:09:03 UTC (rev 1320)
+++ trunk/src/score/repeatmark.cpp	2012-09-01 19:10:20 UTC (rev 1321)
@@ -62,6 +62,7 @@
 	case (DalVarCoda):
 		return "DalVarCoda";
 	}
+	return "Undefined";
 }
 
 CARepeatMark::CARepeatMarkType CARepeatMark::repeatMarkTypeFromString( const QString r ) {
@@ -88,4 +89,6 @@
 	else
 	if (r=="DalVarCoda")
 		return DalVarCoda;
+	return Undefined;
 }
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1320] trunk/src/score/note.cpp

[<su...@us...>]

Revision: 1320
          http://canorus.svn.sourceforge.net/canorus/?rev=1320&view=rev
Author:   suamor
Date:     2012-09-01 19:09:03 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Return values not well defined in all cases (stem, empty string removed!)

Modified Paths:
--------------
    trunk/src/score/note.cpp

Modified: trunk/src/score/note.cpp
===================================================================
--- trunk/src/score/note.cpp	2012-09-01 19:04:27 UTC (rev 1319)
+++ trunk/src/score/note.cpp	2012-09-01 19:09:03 UTC (rev 1320)
@@ -283,9 +283,10 @@
 			return "stem-neutral";
 		case CANote::StemPreferred:
 			return "stem-preferred";
-		default:
-			return "";
+		case CANote::StemUndefined:
+			return "stem-preferred";
 	}
+	return "stem-preferred";
 }
 
 /*!
@@ -342,6 +343,8 @@
 					else
 						return StemDown;
 					break;
+				default: // We should always have a defined stem here
+					return StemUndefined;
 			}
 			break;
 		default:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1319] trunk/src/score/muselement.cpp

[<su...@us...>]

Revision: 1319
          http://canorus.svn.sourceforge.net/canorus/?rev=1319&view=rev
Author:   suamor
Date:     2012-09-01 19:04:27 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Several music element types were not handled

Modified Paths:
--------------
    trunk/src/score/muselement.cpp

Modified: trunk/src/score/muselement.cpp
===================================================================
--- trunk/src/score/muselement.cpp	2012-09-01 19:03:15 UTC (rev 1318)
+++ trunk/src/score/muselement.cpp	2012-09-01 19:04:27 UTC (rev 1319)
@@ -92,7 +92,13 @@
 		case (Slur): return "slur"; break;
 		case (FunctionMark): return "function-mark"; break;
 		case (Syllable): return "syllable"; break;
+		case (MidiNote): return "midi-note"; break;
+		case (Tuplet): return "tuplet"; break;
+		case (Mark): return "mark"; break;
+		case (FiguredBassMark): return "figured-bass-mark"; break;
 	}
+	// Do not add a default case as else newly added elements might be forgotten here!
+	return QString();
 }
 
 /*!
@@ -111,6 +117,11 @@
 	if ( type=="slur" ) return Slur;
 	if ( type=="function-mark" ) return FunctionMark;
 	if ( type=="syllable" ) return Syllable;
+	if ( type=="mark" ) return Mark;
+	if ( type=="figured-bass-mark" ) return FiguredBassMark;
+	if ( type=="tuplet" ) return Tuplet;
+	if ( type=="midi-note" ) return MidiNote;
+	return Undefined;
 }
 
 /*!

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1318] trunk/src/score/lyricscontext.cpp

[<su...@us...>]

Revision: 1318
          http://canorus.svn.sourceforge.net/canorus/?rev=1318&view=rev
Author:   suamor
Date:     2012-09-01 19:03:15 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: unused variable commented

Modified Paths:
--------------
    trunk/src/score/lyricscontext.cpp

Modified: trunk/src/score/lyricscontext.cpp
===================================================================
--- trunk/src/score/lyricscontext.cpp	2012-09-01 17:03:18 UTC (rev 1317)
+++ trunk/src/score/lyricscontext.cpp	2012-09-01 19:03:15 UTC (rev 1318)
@@ -185,7 +185,7 @@
 bool CALyricsContext::addSyllable( CASyllable *syllable, bool replace ) {
 	int i;
 	for (i=0; i<_syllableList.size() && _syllableList[i]->timeStart()<syllable->timeStart(); i++);
-	int s = _syllableList.size();
+	//int s = _syllableList.size();
 	if ( i<_syllableList.size() && replace ) {
 		delete _syllableList.takeAt(i);
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1317] trunk/src/score/keysignature.cpp

[<su...@us...>]

Revision: 1317
          http://canorus.svn.sourceforge.net/canorus/?rev=1317&view=rev
Author:   suamor
Date:     2012-09-01 17:03:18 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes:
  - Added missing cases for clone (why was there a case in the first place ?)
  - return values not defined in all cases (bufferedInput)

Modified Paths:
--------------
    trunk/src/score/keysignature.cpp

Modified: trunk/src/score/keysignature.cpp
===================================================================
--- trunk/src/score/keysignature.cpp	2012-09-01 17:01:53 UTC (rev 1316)
+++ trunk/src/score/keysignature.cpp	2012-09-01 17:03:18 UTC (rev 1317)
@@ -112,6 +112,10 @@
 	switch (keySignatureType()) {
 	case MajorMinor:
 		k = new CAKeySignature( diatonicKey(), static_cast<CAStaff*>(context), timeStart());
+		break;
+	case Modus:
+	case Custom:
+		break;
 	}
 
 	for (int i=0; i<markList().size(); i++) {
@@ -159,6 +163,7 @@
 	case Custom:
 		return "custom";
 	}
+	return "";
 }
 
 const QString CAKeySignature::modusToString(CAModus modus) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1316] trunk/src/score/interval.cpp

[<su...@us...>]

Revision: 1316
          http://canorus.svn.sourceforge.net/canorus/?rev=1316&view=rev
Author:   suamor
Date:     2012-09-01 17:01:53 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes:
  - && / || warning logic solved with additional braces
  - Unused variable commented
  - Return values not defined in all cases (qualityToReadable)

Modified Paths:
--------------
    trunk/src/score/interval.cpp

Modified: trunk/src/score/interval.cpp
===================================================================
--- trunk/src/score/interval.cpp	2012-09-01 17:00:31 UTC (rev 1315)
+++ trunk/src/score/interval.cpp	2012-09-01 17:01:53 UTC (rev 1316)
@@ -55,7 +55,7 @@
 CAInterval::CAInterval( CADiatonicPitch pitch1, CADiatonicPitch pitch2, bool absolute ) {
 	CADiatonicPitch pLow, pHigh;
 	if ( pitch1.noteName() < pitch2.noteName() ||
-	     pitch1.noteName() == pitch2.noteName() && pitch1.accs() <= pitch2.accs() ) {
+	     ( pitch1.noteName() == pitch2.noteName() && pitch1.accs() <= pitch2.accs() ) ) {
 		pLow = pitch1; pHigh = pitch2;
 	} else {
 		pLow = pitch2; pHigh = pitch1;
@@ -63,7 +63,7 @@
 
 	setQuantity( pHigh.noteName() - pLow.noteName() + 1);
 	int relQnt = ((quantity()-1)%7)+1;
-	int relPLow = pLow.noteName()%7, relPHigh = pHigh.noteName()%7;
+	int relPLow = pLow.noteName()%7/*, relPHigh = pHigh.noteName()%7*/;
 
 	int deltaQlt;
 	switch (relQnt) {
@@ -110,15 +110,15 @@
 
 	// prime, fourth, fifth are perfect, diminished or augmented
 	if ( relQnt==1 || relQnt==4 || relQnt==5 ) {
-		if ( deltaQlt==2 && pHigh.accs()-pLow.accs()==-1 ||
-		     deltaQlt==0 && pHigh.accs()-pLow.accs()<=-1 ) {
+		if ( ( deltaQlt==2 && pHigh.accs()-pLow.accs()==-1 ) ||
+		     ( deltaQlt==0 && pHigh.accs()-pLow.accs()<=-1 ) ) {
 			setQuality( deltaQlt + pHigh.accs() - pLow.accs() - 1 );
 		} else
 		if ( deltaQlt==2 && pHigh.accs() - pLow.accs() < -1 ) {
 			setQuality( deltaQlt + pHigh.accs() - pLow.accs() - 2 );
 		} else
-		if ( deltaQlt==-2 && pHigh.accs()-pLow.accs()==1 ||
-		     deltaQlt==0 && pHigh.accs()-pLow.accs()>=1 ) {
+		if ( ( deltaQlt==-2 && pHigh.accs()-pLow.accs()==1 ) ||
+		     ( deltaQlt==0 && pHigh.accs()-pLow.accs()>=1 ) ) {
 			setQuality( deltaQlt + pHigh.accs() - pLow.accs() + 1 );
 		} else
 		if ( deltaQlt==-2 && pHigh.accs() - pLow.accs() > 1 ) {
@@ -139,7 +139,7 @@
 
 	if (!absolute &&
 	    (pitch1.noteName()>pitch2.noteName() ||
-	     pitch1.noteName()==pitch2.noteName() && pitch1.accs()>pitch2.accs()
+	     ( pitch1.noteName()==pitch2.noteName() && pitch1.accs()>pitch2.accs() )
 	   )) {
 		setQuantity( -quantity() );
 	}
@@ -261,7 +261,7 @@
 	case -1: return QObject::tr( "Minor", "interval" );
 	case 2: return QObject::tr( "Augmented", "interval" );
 	case -2: return QObject::tr( "Diminished", "interval" );
-	default: QString::number(k);
+	default: return QString::number(k);
 	}
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1315] trunk/src/score/functionmarkcontext.cpp

[<su...@us...>]

Revision: 1315
          http://canorus.svn.sourceforge.net/canorus/?rev=1315&view=rev
Author:   suamor
Date:     2012-09-01 17:00:31 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: && / || warning logic solved with additional braces

Modified Paths:
--------------
    trunk/src/score/functionmarkcontext.cpp

Modified: trunk/src/score/functionmarkcontext.cpp
===================================================================
--- trunk/src/score/functionmarkcontext.cpp	2012-09-01 16:59:32 UTC (rev 1314)
+++ trunk/src/score/functionmarkcontext.cpp	2012-09-01 17:00:31 UTC (rev 1315)
@@ -104,7 +104,7 @@
 	int TS, TL;
 	int curIdx;
 	QList<CAPlayable*> chord;
-	for ( TS=0, curIdx=0; sheet() && (chord=sheet()->getChord(TS)).size() || curIdx<_functionMarkList.size(); TS+=TL ) {
+	for ( TS=0, curIdx=0; ( sheet() && (chord=sheet()->getChord(TS)).size() ) || curIdx<_functionMarkList.size(); TS+=TL ) {
 		TL = (chord.size()?chord[0]->timeLength():256);
 		for ( int i=0; i<chord.size(); i++ )
 			if (chord[i]->timeLength()<TL)
@@ -116,7 +116,7 @@
 		}
 
 		// apply timestart and length to existing function marks
-		for ( int startIdx = curIdx; curIdx==0 || curIdx < _functionMarkList.size() && _functionMarkList[curIdx]->timeStart()==_functionMarkList[startIdx]->timeStart(); curIdx++ ) {
+		for ( int startIdx = curIdx; curIdx==0 || ( curIdx < _functionMarkList.size() && _functionMarkList[curIdx]->timeStart()==_functionMarkList[startIdx]->timeStart() ); curIdx++ ) {
 			_functionMarkList[curIdx]->setTimeLength( TL );
 			_functionMarkList[curIdx]->setTimeStart( TS );
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1314] trunk/src/score/fingering.cpp

[<su...@us...>]

Revision: 1314
          http://canorus.svn.sourceforge.net/canorus/?rev=1314&view=rev
Author:   suamor
Date:     2012-09-01 16:59:32 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: return values not defined in all cases (fingerNumberToString)

Modified Paths:
--------------
    trunk/src/score/fingering.cpp

Modified: trunk/src/score/fingering.cpp
===================================================================
--- trunk/src/score/fingering.cpp	2012-09-01 16:58:37 UTC (rev 1313)
+++ trunk/src/score/fingering.cpp	2012-09-01 16:59:32 UTC (rev 1314)
@@ -84,6 +84,7 @@
 	case Undefined:
 		return "Undefined";
 	}
+	return "Undefined";
 }
 
 CAFingering::CAFingerNumber CAFingering::fingerNumberFromString( const QString f ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1313] trunk/src/score/figuredbasscontext.cpp

[<su...@us...>]

Revision: 1313
          http://canorus.svn.sourceforge.net/canorus/?rev=1313&view=rev
Author:   suamor
Date:     2012-09-01 16:58:37 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: unused variable commented

Modified Paths:
--------------
    trunk/src/score/figuredbasscontext.cpp

Modified: trunk/src/score/figuredbasscontext.cpp
===================================================================
--- trunk/src/score/figuredbasscontext.cpp	2012-09-01 16:57:24 UTC (rev 1312)
+++ trunk/src/score/figuredbasscontext.cpp	2012-09-01 16:58:37 UTC (rev 1313)
@@ -38,7 +38,7 @@
 void CAFiguredBassContext::addFiguredBassMark( CAFiguredBassMark *m, bool replace ) {
 	int i;
 	for (i=0; i<_figuredBassMarkList.size() && _figuredBassMarkList[i]->timeStart()<m->timeStart(); i++);
-	int s = _figuredBassMarkList.size();
+	//int s = _figuredBassMarkList.size();
 	if ( i<_figuredBassMarkList.size() && replace ) {
 		delete _figuredBassMarkList.takeAt(i);
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1312] trunk/src/score/fermata.cpp

[<su...@us...>]

Revision: 1312
          http://canorus.svn.sourceforge.net/canorus/?rev=1312&view=rev
Author:   suamor
Date:     2012-09-01 16:57:24 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes:
Return NormalFermata in fermataTypeFromString for unknown strings

Modified Paths:
--------------
    trunk/src/score/fermata.cpp

Modified: trunk/src/score/fermata.cpp
===================================================================
--- trunk/src/score/fermata.cpp	2012-09-01 16:53:01 UTC (rev 1311)
+++ trunk/src/score/fermata.cpp	2012-09-01 16:57:24 UTC (rev 1312)
@@ -60,6 +60,7 @@
 	case VeryLongFermata:
 		return "VeryLongFermata";
 	}
+	return "NormalFermata";
 }
 
 CAFermata::CAFermataType CAFermata::fermataTypeFromString( const QString r ) {
@@ -75,4 +76,6 @@
 	if (r=="VeryLongFermata") {
 		return VeryLongFermata;
 	}
+	return NormalFermata;
 }
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1311] trunk/src/score/dynamic.cpp

[<su...@us...>]

Revision: 1311
          http://canorus.svn.sourceforge.net/canorus/?rev=1311&view=rev
Author:   suamor
Date:     2012-09-01 16:53:01 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes:
return values not defined in all cases (dynamicTextToString)

Modified Paths:
--------------
    trunk/src/score/dynamic.cpp

Modified: trunk/src/score/dynamic.cpp
===================================================================
--- trunk/src/score/dynamic.cpp	2012-09-01 16:50:23 UTC (rev 1310)
+++ trunk/src/score/dynamic.cpp	2012-09-01 16:53:01 UTC (rev 1311)
@@ -64,6 +64,7 @@
 		case sp: return "sp";
 		case Custom: return "";
 	}
+	return "";
 }
 
 CADynamic::CADynamicText CADynamic::dynamicTextFromString( const QString t ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1310] trunk/src/score/crescendo.cpp

[<su...@us...>]

Revision: 1310
          http://canorus.svn.sourceforge.net/canorus/?rev=1310&view=rev
Author:   suamor
Date:     2012-09-01 16:50:23 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes:
Return Crescendo in crescendoTypeFromString for unknown strings

Modified Paths:
--------------
    trunk/src/score/crescendo.cpp

Modified: trunk/src/score/crescendo.cpp
===================================================================
--- trunk/src/score/crescendo.cpp	2012-09-01 16:38:04 UTC (rev 1309)
+++ trunk/src/score/crescendo.cpp	2012-09-01 16:50:23 UTC (rev 1310)
@@ -54,6 +54,7 @@
 	case Decrescendo:
 		return "Decrescendo";
 	}
+	return "Crescendo";
 }
 
 CACrescendo::CACrescendoType CACrescendo::crescendoTypeFromString( const QString c ) {
@@ -63,4 +64,6 @@
 	if (c=="Decrescendo") {
 		return Decrescendo;
 	}
+	return Crescendo;
 }
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1309] trunk/src/score/clef.cpp

[<su...@us...>]

Revision: 1309
          http://canorus.svn.sourceforge.net/canorus/?rev=1309&view=rev
Author:   suamor
Date:     2012-09-01 16:38:04 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Added missing cases that were not handled

Modified Paths:
--------------
    trunk/src/score/clef.cpp

Modified: trunk/src/score/clef.cpp
===================================================================
--- trunk/src/score/clef.cpp	2012-09-01 16:36:05 UTC (rev 1308)
+++ trunk/src/score/clef.cpp	2012-09-01 16:38:04 UTC (rev 1309)
@@ -88,6 +88,10 @@
 			setClefType(F);
 			_c1 = 12 - offset();
 			break;
+		case Undefined:
+		case Percussion:
+		case Tablature:
+			break;
 	}
 }
 
@@ -103,6 +107,10 @@
 	case G: _centerPitch=32; break;
 	case F: _centerPitch=24; break;
 	case C: _centerPitch=28; break;
+	case PercussionHigh:
+	case PercussionLow:
+	case Tab:
+		break;
 	}
 
 	_centerPitch += offset();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1308] trunk/src/score/articulation.h

[<su...@us...>]

Revision: 1308
          http://canorus.svn.sourceforge.net/canorus/?rev=1308&view=rev
Author:   suamor
Date:     2012-09-01 16:36:05 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: additionally return 'n'
  (might cause or fix a bug)

Modified Paths:
--------------
    trunk/src/score/articulation.h

Modified: trunk/src/score/articulation.h
===================================================================
--- trunk/src/score/articulation.h	2012-09-01 16:33:10 UTC (rev 1307)
+++ trunk/src/score/articulation.h	2012-09-01 16:36:05 UTC (rev 1308)
@@ -50,7 +50,7 @@
 	int compare(CAMusElement *elt);
 
 	inline CANote *associatedNote() { return static_cast<CANote*>(associatedElement()); }
-	inline void *setAssociatedNote( CANote* n ) { setAssociatedElement(n); }
+	inline void *setAssociatedNote( CANote* n ) { setAssociatedElement(n); return n; }
 
 	inline CAArticulationType articulationType() { return _articulationType; }
 	inline void setArticulationType( CAArticulationType t ) { _articulationType = t; }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1307] trunk/src/layout/layoutengine.cpp

[<su...@us...>]

Revision: 1307
          http://canorus.svn.sourceforge.net/canorus/?rev=1307&view=rev
Author:   suamor
Date:     2012-09-01 16:33:10 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large warn fixes:
  - && / || warning logic solved with additional braces
  - Unused variable commented
  - Added missing cases that were not handled
  - Possible bug due to unused variable placedSymbol
  - Fixed local buffer (array) problems by allocating them on the heap (performance might need to be improved)

Modified Paths:
--------------
    trunk/src/layout/layoutengine.cpp

Modified: trunk/src/layout/layoutengine.cpp
===================================================================
--- trunk/src/layout/layoutengine.cpp	2012-09-01 16:29:32 UTC (rev 1306)
+++ trunk/src/layout/layoutengine.cpp	2012-09-01 16:33:10 UTC (rev 1307)
@@ -71,7 +71,7 @@
 	This function doesn't clear the view, but only adds the elements.
 */
 void CALayoutEngine::reposit( CAScoreView *v ) {
-	int i;
+	//int i;
 	CASheet *sheet = v->sheet();
 
 	//list of all the music element lists (ie. streams) taken from all the contexts
@@ -148,18 +148,25 @@
 	}
 
 	int streams = musStreamList.size();
-	int streamsIdx[streams]; for (int i=0; i<streams; i++) streamsIdx[i] = 0;
-	int streamsX[streams]; for (int i=0; i<streams; i++) streamsX[i] = INITIAL_X_OFFSET;
-	int streamsRehersalMarks[streams]; for (int i=0; i<streams; i++) streamsRehersalMarks[i] = 0;
+	int *streamsIdx = new int[streams];
+	for (int i=0; i<streams; i++) streamsIdx[i] = 0;
+	int *streamsX = new int(streams);
+	for (int i=0; i<streams; i++) streamsX[i] = INITIAL_X_OFFSET;
+	int *streamsRehersalMarks = new int(streams);
+	for (int i=0; i<streams; i++) streamsRehersalMarks[i] = 0;
 	CALayoutEngine::streamsRehersalMarks = streamsRehersalMarks;
-	CAClef *lastClef[streams]; for (int i=0; i<streams; i++) lastClef[i] = 0;
-	CAKeySignature *lastKeySig[streams]; for (int i=0; i<streams; i++) lastKeySig[i] = 0;
-	CATimeSignature *lastTimeSig[streams]; for (int i=0; i<streams; i++) lastTimeSig[i] = 0;
+	CAClef **lastClef = new CAClef *[streams];
+	for (int i=0; i<streams; i++) lastClef[i] = 0;
+	CAKeySignature **lastKeySig = new CAKeySignature *[streams];
+	for (int i=0; i<streams; i++) lastKeySig[i] = 0;
+	CATimeSignature **lastTimeSig = new CATimeSignature *[streams];
+	for (int i=0; i<streams; i++) lastTimeSig[i] = 0;
 	scalableElts.clear();
 
 	int timeStart = 0;
 	bool done = false;
-	CADrawableFunctionMarkSupport *lastDFMTonicizations[streams]; for (int i=0; i<streams; i++) lastDFMTonicizations[i]=0;
+	CADrawableFunctionMarkSupport **lastDFMTonicizations = new CADrawableFunctionMarkSupport *[streams];
+	for (int i=0; i<streams; i++) lastDFMTonicizations[i]=0;
 	while (!done) {
 		//if all the indices are at the end of the streams, finish.
 		int idx;
@@ -185,7 +192,7 @@
 		//go through all the streams and check if the following element has this time
 		CAMusElement *elt;
 		CADrawableContext *drawableContext;
-		bool placedSymbol = false;	//used if waiting for notes to gather and a non-time-consuming symbol has been placed
+		//bool placedSymbol = false;	//used if waiting for notes to gather and a non-time-consuming symbol has been placed
 		for (int i=0; i < streams; i++) {
 			//loop until the first playable element
 			//multiple elements can have the same start time. eg. Clef + Key signature + Time signature + First note
@@ -219,7 +226,7 @@
 									lastClef[j] = clef->clef();
 
 							streamsX[i] += (clef->neededWidth() + MINIMUM_SPACE);
-							placedSymbol = true;
+							//placedSymbol = true;
 
 							placeMarks( clef, v, i );
 
@@ -241,7 +248,7 @@
 									lastKeySig[j] = keySig->keySignature();
 
 							streamsX[i] += (keySig->neededWidth() + MINIMUM_SPACE);
-							placedSymbol = true;
+							//placedSymbol = true;
 
 							placeMarks( keySig, v, i );
 
@@ -263,15 +270,29 @@
 									lastTimeSig[j] = timeSig->timeSignature();
 
 							streamsX[i] += (timeSig->neededWidth() + MINIMUM_SPACE);
-							placedSymbol = true;
+							//placedSymbol = true;
 
 							placeMarks( timeSig, v, i );
 
 							break;
 						}
-					} /* SWITCH */
+						case CAMusElement::Rest:
+						case CAMusElement::Note:
+						case CAMusElement::MidiNote:
+						case CAMusElement::Barline:
+						case CAMusElement::Slur:
+						case CAMusElement::Tuplet:
+						case CAMusElement::Syllable:
+						case CAMusElement::FunctionMark:
+						case CAMusElement::FiguredBassMark:
+						case CAMusElement::Mark:
+						case CAMusElement::Undefined: {
+							fprintf(stderr,"Warning: CALayoutEngine::reposit - Unhandled Element %d",elt->musElementType());
+							break;
+						}
+					} // SWITCH
 
-				} /* IF firstVoice */
+				} // IF firstVoice
 				streamsIdx[i]++;
 			}
 		}
@@ -332,7 +353,7 @@
 				);
 
 				v->addMElement(bar);
-				placedSymbol = true;
+				//placedSymbol = true;
 				streamsX[i] += (bar->neededWidth() + MINIMUM_SPACE);
 				streamsIdx[i] = streamsIdx[i] + 1;
 
@@ -727,7 +748,7 @@
 						    // always place tonicization, if ellipse is present
 						    //|| ((CAFunctionMark*)musStreamList[i].at(j))->isPartOfEllipse()
 						)) {
-							CAFunctionMark::CAFunctionType type = ((CAFunctionMark*)musStreamList[i].at(j))->tonicDegree();
+							//CAFunctionMark::CAFunctionType type = ((CAFunctionMark*)musStreamList[i].at(j))->tonicDegree();
 							CAFunctionMark *right = (CAFunctionMark*)musStreamList[i].at(j);
 
 							// find the n-th element back
@@ -801,7 +822,7 @@
 						CADrawableFunctionMarkSupport *hChordAreaRect=0;
 						if (j>=0 && // don't draw rectangle, if the current element would still be in the rectangle
 						    (
-						     ((CAFunctionMark*)musStreamList[i].at(j))->key()==function->key() && ((CAFunctionMark*)musStreamList[i].at(j))->function()!=function->function() && ((CAFunctionMark*)musStreamList[i].at(j))->function()!=function->chordArea() && ((CAFunctionMark*)musStreamList[i].at(j))->chordArea()!=function->chordArea()
+						     (((CAFunctionMark*)musStreamList[i].at(j))->key()==function->key() && ((CAFunctionMark*)musStreamList[i].at(j))->function()!=function->function() && ((CAFunctionMark*)musStreamList[i].at(j))->function()!=function->chordArea() && ((CAFunctionMark*)musStreamList[i].at(j))->chordArea()!=function->chordArea())
 						     || ((CAFunctionMark*)musStreamList[i].at(j))->key()!=function->key()
 						     || j==musStreamList[i].size()
 						    )
@@ -838,19 +859,19 @@
 						    function->chordArea()!=CAFunctionMark::Undefined &&
 						    function->chordArea()!=function->function() && // chord area is the same as function name - don't draw chordarea then
 						    (j-1<0 ||
-						     (((CAFunctionMark*)musStreamList[i].at(j-1))->key()==function->key() &&
+						     ((((CAFunctionMark*)musStreamList[i].at(j-1))->key()==function->key() &&
 						      ((CAFunctionMark*)musStreamList[i].at(j-1))->chordArea()!=function->chordArea() &&
 						      ((CAFunctionMark*)musStreamList[i].at(j-1))->function()!=function->chordArea() &&
-						      ((CAFunctionMark*)musStreamList[i].at(j-1))->chordArea()!=function->function() ||
+						      ((CAFunctionMark*)musStreamList[i].at(j-1))->chordArea()!=function->function()) ||
 						      ((CAFunctionMark*)musStreamList[i].at(j-1))->tonicDegree()!=function->tonicDegree() ||
 						      ((CAFunctionMark*)musStreamList[i].at(j-1))->key()!=function->key()
 						     )
 						    ) &&
 						    (j+1>=musStreamList[i].size() ||
-						     (((CAFunctionMark*)musStreamList[i].at(j+1))->key()==function->key() &&
+						     ((((CAFunctionMark*)musStreamList[i].at(j+1))->key()==function->key() &&
 						      ((CAFunctionMark*)musStreamList[i].at(j+1))->chordArea()!=function->chordArea() &&
 						      ((CAFunctionMark*)musStreamList[i].at(j+1))->function()!=function->chordArea() &&
-						      ((CAFunctionMark*)musStreamList[i].at(j+1))->chordArea()!=function->function() ||
+						      ((CAFunctionMark*)musStreamList[i].at(j+1))->chordArea()!=function->function()) ||
 						      ((CAFunctionMark*)musStreamList[i].at(j+1))->tonicDegree()!=function->tonicDegree() ||
 						      ((CAFunctionMark*)musStreamList[i].at(j+1))->key()!=function->key()
 						     )
@@ -939,6 +960,17 @@
 
 						break;
 					}
+					case CAMusElement::Barline:
+					case CAMusElement::Slur:
+					case CAMusElement::Tuplet:
+					case CAMusElement::Mark:
+					case CAMusElement::KeySignature:
+					case CAMusElement::TimeSignature:
+					case CAMusElement::Clef:
+					case CAMusElement::Undefined: {
+						fprintf(stderr,"Warning: CALayoutEngine::reposit2 - Unhandled Element %d",elt->musElementType());
+						break;
+					}
 				}
 
 				streamsIdx[i]++;
@@ -953,6 +985,13 @@
 		scalableElts[i]->setWidth( v->timeToCoords(scalableElts[i]->musElement()->timeEnd()) - scalableElts[i]->xPos() );
 		v->addMElement(scalableElts[i]);
 	}
+	delete [] streamsIdx;
+	delete [] streamsX;
+	delete [] streamsRehersalMarks;
+	delete [] lastClef;
+	delete [] lastKeySig;
+	delete [] lastTimeSig;
+	delete [] lastDFMTonicizations;
 }
 
 /*!
@@ -973,9 +1012,9 @@
 
 		int yCoord;
 		if ( mark->markType()==CAMark::Pedal ||
-		     ( mark->markType()==CAMark::Fingering && (static_cast<CAFingering*>(mark)->fingerList()[0]==CAFingering::LHeel || static_cast<CAFingering*>(mark)->fingerList()[0]==CAFingering::LToe )) ||
-		     elt->musElementType()==CAMusElement::Note && static_cast<CANote*>(elt)->actualSlurDirection()==CASlur::SlurDown &&
-		       (mark->markType()==CAMark::Text || mark->markType()==CAMark::Fermata || mark->markType()==CAMark::Articulation || mark->markType()==CAMark::Fingering && static_cast<CAFingering*>(mark)->fingerList()[0]!=CAFingering::LHeel && static_cast<CAFingering*>(mark)->fingerList()[0]!=CAFingering::LToe ))  {
+		     (((mark->markType()==CAMark::Fingering && (static_cast<CAFingering*>(mark)->fingerList()[0]==CAFingering::LHeel)) || static_cast<CAFingering*>(mark)->fingerList()[0]==CAFingering::LToe )) ||
+		     (elt->musElementType()==CAMusElement::Note && static_cast<CANote*>(elt)->actualSlurDirection()==CASlur::SlurDown &&
+		       ((mark->markType()==CAMark::Text) || (mark->markType()==CAMark::Fermata) || (mark->markType()==CAMark::Articulation) || (mark->markType()==CAMark::Fingering && static_cast<CAFingering*>(mark)->fingerList()[0]!=CAFingering::LHeel && static_cast<CAFingering*>(mark)->fingerList()[0]!=CAFingering::LToe ))))  {
 			// place mark below
 			xCoord = e->xPos();
 			yCoord = qMax(e->yPos()+e->height(),e->drawableContext()->yPos()+e->drawableContext()->height())+20*(k+1);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1306] trunk/src/layout/kdtree.h

[<su...@us...>]

Revision: 1306
          http://canorus.svn.sourceforge.net/canorus/?rev=1306&view=rev
Author:   suamor
Date:     2012-09-01 16:29:32 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: && / || warning logic solved with additional braces

Modified Paths:
--------------
    trunk/src/layout/kdtree.h

Modified: trunk/src/layout/kdtree.h
===================================================================
--- trunk/src/layout/kdtree.h	2012-09-01 16:28:19 UTC (rev 1305)
+++ trunk/src/layout/kdtree.h	2012-09-01 16:29:32 UTC (rev 1306)
@@ -208,11 +208,11 @@
 		     ( !context  || static_cast<CADrawableMusElement*>(_list[i])->drawableContext() == context ) && // compare contexts
 		     ( !voice || // compare voices
 		       (
-		         !(static_cast<CADrawableMusElement*>(_list[i]))->musElement()->isPlayable() && // if the element isn't playable, see if it has the same context as the voice
-		         ((static_cast<CADrawableMusElement*>(_list[i]))->musElement()->context() == voice->staff() && voice->musElementList().contains(static_cast<CADrawableMusElement*>(_list[i])->musElement()))
+		         (!(static_cast<CADrawableMusElement*>(_list[i]))->musElement()->isPlayable() && // if the element isn't playable, see if it has the same context as the voice
+		         ((static_cast<CADrawableMusElement*>(_list[i]))->musElement()->context() == voice->staff() && voice->musElementList().contains(static_cast<CADrawableMusElement*>(_list[i])->musElement())))
 		         ||
-		         (static_cast<CADrawableMusElement*>(_list[i]))->musElement()->isPlayable() && // if the element is playable, see if it has the exactly same voice
-		         static_cast<CAPlayable*>(static_cast<CADrawableMusElement*>(_list[i])->musElement())->voice() == voice
+		         ((static_cast<CADrawableMusElement*>(_list[i]))->musElement()->isPlayable() && // if the element is playable, see if it has the exactly same voice
+		         static_cast<CAPlayable*>(static_cast<CADrawableMusElement*>(_list[i])->musElement())->voice() == voice)
 		      )
 			 )
 		   ) {
@@ -245,11 +245,11 @@
 		     ( !context  || static_cast<CADrawableMusElement*>(_list[i])->drawableContext() == context ) && // compare contexts
 		     ( !voice || // compare voices
 		       (
-		         !(static_cast<CADrawableMusElement*>(_list[i]))->musElement()->isPlayable() && // if the element isn't playable, see if it has the same context as the voice
-		         ((static_cast<CADrawableMusElement*>(_list[i]))->musElement()->context() == voice->staff() && voice->musElementList().contains((static_cast<CADrawableMusElement*>(_list[i]))->musElement()))
+		         (!(static_cast<CADrawableMusElement*>(_list[i]))->musElement()->isPlayable() && // if the element isn't playable, see if it has the same context as the voice
+		         ((static_cast<CADrawableMusElement*>(_list[i]))->musElement()->context() == voice->staff() && voice->musElementList().contains((static_cast<CADrawableMusElement*>(_list[i]))->musElement())))
 		         ||
-		         (static_cast<CADrawableMusElement*>(_list[i]))->musElement()->isPlayable() && // if the element is playable, see if it has the exactly same voice
-		         static_cast<CAPlayable*>(static_cast<CADrawableMusElement*>(_list[i])->musElement())->voice() == voice
+		         ((static_cast<CADrawableMusElement*>(_list[i]))->musElement()->isPlayable() && // if the element is playable, see if it has the exactly same voice
+		         static_cast<CAPlayable*>(static_cast<CADrawableMusElement*>(_list[i])->musElement())->voice() == voice)
 		       )
 		     )
 		   ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1305] trunk/src/layout/drawabletimesignature.cpp

[<su...@us...>]

Revision: 1305
          http://canorus.svn.sourceforge.net/canorus/?rev=1305&view=rev
Author:   suamor
Date:     2012-09-01 16:28:19 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes:
  - Added missing break in some cases
  - Added missing cases that were not handled

Modified Paths:
--------------
    trunk/src/layout/drawabletimesignature.cpp

Modified: trunk/src/layout/drawabletimesignature.cpp
===================================================================
--- trunk/src/layout/drawabletimesignature.cpp	2012-09-01 16:26:20 UTC (rev 1304)
+++ trunk/src/layout/drawabletimesignature.cpp	2012-09-01 16:28:19 UTC (rev 1305)
@@ -64,6 +64,7 @@
 				p->drawText(s.x, qRound(s.y + 0.5*height()*s.z), QString(CACanorus::fetaCodepoint("timesig.C22")));
 				break;
 			}
+			break;
 		}
 		case CATimeSignature::Number: {
 			//write the numbers one by one, first, the number of beats
@@ -83,6 +84,11 @@
 
 			break;
 		}
+		case CATimeSignature::Baroque:
+		case CATimeSignature::Neomensural:
+		case CATimeSignature::Mensural:
+			fprintf(stderr,"Warning: CADrawableTimeSignature::draw - Unhandled type %d",timeSignature()->timeSignatureType());
+			break;
 	}
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1304] trunk/src/layout/drawablestaff.cpp

[<su...@us...>]

Revision: 1304
          http://canorus.svn.sourceforge.net/canorus/?rev=1304&view=rev
Author:   suamor
Date:     2012-09-01 16:26:20 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Added missing cases that were not handled

Modified Paths:
--------------
    trunk/src/layout/drawablestaff.cpp

Modified: trunk/src/layout/drawablestaff.cpp
===================================================================
--- trunk/src/layout/drawablestaff.cpp	2012-09-01 16:25:21 UTC (rev 1303)
+++ trunk/src/layout/drawablestaff.cpp	2012-09-01 16:26:20 UTC (rev 1304)
@@ -248,6 +248,20 @@
 		case CADrawableMusElement::DrawableTimeSignature:
 			addTimeSignature((CADrawableTimeSignature*)elt);
 			break;
+		case CADrawableMusElement::DrawableNote:
+		case CADrawableMusElement::DrawableRest:
+		case CADrawableMusElement::DrawableMidiNote:
+		case CADrawableMusElement::DrawableBarline:
+		case CADrawableMusElement::DrawableAccidental:
+		case CADrawableMusElement::DrawableSlur:
+		case CADrawableMusElement::DrawableTuplet:
+		case CADrawableMusElement::DrawableSyllable:
+		case CADrawableMusElement::DrawableFunctionMark:
+		case CADrawableMusElement::DrawableFunctionMarkSupport:
+		case CADrawableMusElement::DrawableFiguredBassNumber:
+		case CADrawableMusElement::DrawableMark:
+			fprintf(stderr,"Warning: CADrawableStaff::addMElement - Unhandled element %d",elt->drawableMusElementType());
+			break;
 	}
 
 	_drawableMusElementList << elt;
@@ -264,6 +278,20 @@
 		case CADrawableMusElement::DrawableTimeSignature:
 			removeTimeSignature((CADrawableTimeSignature*)elt);
 			break;
+		case CADrawableMusElement::DrawableNote:
+		case CADrawableMusElement::DrawableRest:
+		case CADrawableMusElement::DrawableMidiNote:
+		case CADrawableMusElement::DrawableBarline:
+		case CADrawableMusElement::DrawableAccidental:
+		case CADrawableMusElement::DrawableSlur:
+		case CADrawableMusElement::DrawableTuplet:
+		case CADrawableMusElement::DrawableSyllable:
+		case CADrawableMusElement::DrawableFunctionMark:
+		case CADrawableMusElement::DrawableFunctionMarkSupport:
+		case CADrawableMusElement::DrawableFiguredBassNumber:
+		case CADrawableMusElement::DrawableMark:
+			fprintf(stderr,"Warning: CADrawableStaff::removeMElement - Unhandled element %d",elt->drawableMusElementType());
+			break;
 	}
 
 	return _drawableMusElementList.removeAll(elt);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1303] trunk/src/layout/drawableslur.cpp

[<su...@us...>]

Revision: 1303
          http://canorus.svn.sourceforge.net/canorus/?rev=1303&view=rev
Author:   suamor
Date:     2012-09-01 16:25:21 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Added missing cases that were not handled

Modified Paths:
--------------
    trunk/src/layout/drawableslur.cpp

Modified: trunk/src/layout/drawableslur.cpp
===================================================================
--- trunk/src/layout/drawableslur.cpp	2012-09-01 16:24:38 UTC (rev 1302)
+++ trunk/src/layout/drawableslur.cpp	2012-09-01 16:25:21 UTC (rev 1303)
@@ -7,6 +7,7 @@
 
 #include "layout/drawableslur.h"
 #include <QPainter>
+#include <stdio.h>
 
 CADrawableSlur::CADrawableSlur( CASlur *slur, CADrawableContext *c, double x1, double y1, double xMid, double yMid, double x2, double y2  )
  : CADrawableMusElement( slur, c, x1, 0) {
@@ -70,6 +71,9 @@
 		case CASlur::SlurDotted:
 			pen.setStyle( Qt::DotLine );
 			break;
+		case CASlur::Undefined:
+			fprintf(stderr,"Warning: CADrawableSlur::draw - Unhandled Style %d",slur()->slurStyle());
+			break;
 	}
 	p->setPen( pen );
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1302] trunk/src/layout/drawablerest.cpp

[<su...@us...>]

Revision: 1302
          http://canorus.svn.sourceforge.net/canorus/?rev=1302&view=rev
Author:   suamor
Date:     2012-09-01 16:24:38 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Added missing cases that were not handled

Modified Paths:
--------------
    trunk/src/layout/drawablerest.cpp

Modified: trunk/src/layout/drawablerest.cpp
===================================================================
--- trunk/src/layout/drawablerest.cpp	2012-09-01 16:24:09 UTC (rev 1301)
+++ trunk/src/layout/drawablerest.cpp	2012-09-01 16:24:38 UTC (rev 1302)
@@ -73,6 +73,11 @@
 		setHeight( 9 );
 		setYPos(y + static_cast<CADrawableStaff*>(drawableContext)->lineSpace());
 		break;
+
+	case CAPlayableLength::Undefined:
+		fprintf(stderr,"Warning: CADrawableRest::CADrawableRest - Unhandled Length %d",rest->playableLength().musicLength());
+		break;
+
 	}
 
 	_restWidth = _width;
@@ -136,6 +141,9 @@
 		p->drawText(s.x, qRound(s.y + height()*s.z), QString(CACanorus::fetaCodepoint("rests.M1")));
 		break;
 	}
+	case CAPlayableLength::Undefined:
+		fprintf(stderr,"Warning: CADrawableRest::draw - Unhandled Length %d",rest()->playableLength().musicLength());
+		break;
 	}
 
 	///////////////

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1301] trunk/src/layout/drawablenote.cpp

[<su...@us...>]

Revision: 1301
          http://canorus.svn.sourceforge.net/canorus/?rev=1301&view=rev
Author:   suamor
Date:     2012-09-01 16:24:09 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Added missing cases that were not handled

Modified Paths:
--------------
    trunk/src/layout/drawablenote.cpp

Modified: trunk/src/layout/drawablenote.cpp
===================================================================
--- trunk/src/layout/drawablenote.cpp	2012-09-01 16:23:26 UTC (rev 1300)
+++ trunk/src/layout/drawablenote.cpp	2012-09-01 16:24:09 UTC (rev 1301)
@@ -72,6 +72,9 @@
 		setWidth( 18 );
 		setHeight( 8 );
 		break;
+	case CAPlayableLength::Undefined:
+		fprintf(stderr,"Warning: CADrawableNote::CADrawableNote - Unhandled Length %d",n->playableLength().musicLength());
+		break;
 	}
 	setYPos( y - height()/2.0 );
 	setXPos( x );
@@ -109,6 +112,12 @@
 	case CAPlayableLength::Half:
 		_stemLength = HALF_STEM_LENGTH;
 		break;
+	case CAPlayableLength::Whole:
+	case CAPlayableLength::Breve:
+	case CAPlayableLength::Undefined:
+		fprintf(stderr,"Warning: CADrawableNote::CADrawableNote - Unhandled length %d",n->playableLength().musicLength());
+		break;
+
 	}
 
 	_noteHeadWidth = width();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1300] trunk/src/layout/drawablemark.cpp

[<su...@us...>]

Revision: 1300
          http://canorus.svn.sourceforge.net/canorus/?rev=1300&view=rev
Author:   suamor
Date:     2012-09-01 16:23:26 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Added missing cases that were not handled

Modified Paths:
--------------
    trunk/src/layout/drawablemark.cpp

Modified: trunk/src/layout/drawablemark.cpp
===================================================================
--- trunk/src/layout/drawablemark.cpp	2012-09-01 16:22:25 UTC (rev 1299)
+++ trunk/src/layout/drawablemark.cpp	2012-09-01 16:23:26 UTC (rev 1300)
@@ -291,6 +291,10 @@
 			case CARepeatMark::DalCoda:    p->drawText( s.x, s.y, QString(CACanorus::fetaCodepoint("scripts.coda")) ); break;
 			case CARepeatMark::VarCoda:
 			case CARepeatMark::DalVarCoda: p->drawText( s.x, s.y, QString(CACanorus::fetaCodepoint("scripts.varcoda")) ); break;
+			case CARepeatMark::Volta:
+			case CARepeatMark::Undefined:
+				fprintf(stderr,"Warning: CADrawableMark::draw - Unhandled RM-Type %d",static_cast<CARepeatMark*>(mark())->repeatMarkType());
+				break;
 		}
 
 		if (r->repeatMarkType()==CARepeatMark::Volta) {
@@ -355,11 +359,17 @@
 			case CAArticulation::PrallDown:     p->drawText( x, y, QString(CACanorus::fetaCodepoint("scripts.pralldown")) ); break;
 			case CAArticulation::PrallUp:       p->drawText( x, y, QString(CACanorus::fetaCodepoint("scripts.prallup")) ); break;
 			case CAArticulation::LinePrall:     p->drawText( x, y, QString(CACanorus::fetaCodepoint("scripts.lineprall")) ); break;
+			case CAArticulation::Undefined:
+				fprintf(stderr,"Warning: CADrawableMark::draw - Unhandled A-Type %d",static_cast<CAArticulation*>(mark())->articulationType());
+				break;
 
 		}
 
 		break;
 	}
+	case CAMark::Undefined:
+		fprintf(stderr,"Warning: CADrawableMark::draw - Unhandled Type %d",mark()->markType());
+		break;
 	}
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1299] trunk/src/layout/drawablekeysignature.cpp

[<su...@us...>]

Revision: 1299
          http://canorus.svn.sourceforge.net/canorus/?rev=1299&view=rev
Author:   suamor
Date:     2012-09-01 16:22:25 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: && / || warning logic solved with additional braces

Modified Paths:
--------------
    trunk/src/layout/drawablekeysignature.cpp

Modified: trunk/src/layout/drawablekeysignature.cpp
===================================================================
--- trunk/src/layout/drawablekeysignature.cpp	2012-09-01 16:21:22 UTC (rev 1298)
+++ trunk/src/layout/drawablekeysignature.cpp	2012-09-01 16:22:25 UTC (rev 1299)
@@ -41,7 +41,7 @@
 
  		for ( int i=0; i<7; idx += (i%2?4:-3), i++ ) {	// place neutrals for sharps
 			if ( (prevKeySig->accidentals()[idx%7]!=1) ||
-			     (prevKeySig->accidentals()[idx%7]==1) && (keySig->accidentals()[idx%7]==1) )
+			     ((prevKeySig->accidentals()[idx%7]==1) && (keySig->accidentals()[idx%7]==1)) )
 				continue;
 
 			int curIdx=idx;
@@ -72,7 +72,7 @@
 		}
 		for ( int i=0; i<7; idx += (i%2?-4:3), i++ ) {	// place neutrals for flats
 			if ( (prevKeySig->accidentals()[idx%7]!=-1) ||
-			     (prevKeySig->accidentals()[idx%7]==-1) && (keySig->accidentals()[idx%7]==-1) )
+			     ((prevKeySig->accidentals()[idx%7]==-1) && (keySig->accidentals()[idx%7]==-1)) )
 				continue;
 
 			int curIdx=idx;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Canorus-commit] SF.net SVN: canorus:[1298] trunk/src/layout/drawablefunctionmarkcontext.h

[<su...@us...>]

Revision: 1298
          http://canorus.svn.sourceforge.net/canorus/?rev=1298&view=rev
Author:   suamor
Date:     2012-09-01 16:21:22 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn fixes:
  - Move method implementation from header to avoid
      compiler problem with possible undefined member

Modified Paths:
--------------
    trunk/src/layout/drawablefunctionmarkcontext.h

Modified: trunk/src/layout/drawablefunctionmarkcontext.h
===================================================================
--- trunk/src/layout/drawablefunctionmarkcontext.h	2012-09-01 16:20:42 UTC (rev 1297)
+++ trunk/src/layout/drawablefunctionmarkcontext.h	2012-09-01 16:21:22 UTC (rev 1298)
@@ -30,10 +30,12 @@
 		};
 
 		double yPosLine(CAFunctionMarkLine part); // Returns the Y coordinate of the top of the given line
-		void nextLine() { _currentLineIdx = ++_currentLineIdx % _numberOfLines; }
+		void nextLine();
 		int currentLineIdx() { return _currentLineIdx; }
 
 	private:
+    CADrawableFunctionMarkContext() : CADrawableContext(NULL, 0, 0), 
+      _numberOfLines(0), _currentLineIdx(0)  {}
 		int _numberOfLines;	// Number of lines the context can consist. Usually, this number is 2. But when doing research on scores, this could be expanded
 		int _currentLineIdx;
 };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.