Merge pull request #70 from silveur/develop

v1.3.5 fixed reset feature
silveur · Sep 15, 2014 · 18c70e7 · 18c70e7
2 parents c2423d3 + 75c542a
commit 18c70e7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/Other/StepsRaw.dmg b/Other/StepsRaw.dmg
diff --git a/Source/Randomiser.cpp b/Source/Randomiser.cpp
@@ -106,14 +106,7 @@ void Randomiser::buttonClicked(Button* button)
 	}
 	else if (button == theResetAllButton)
 	{
-		FileInputStream inputStream(theDefaultPreset);
-		ValueTree treeToLoad = ValueTree::readFromStream(inputStream);
-		for (int i=0; i<theSequencerTree.getNumChildren(); i++)
-		{
-			ValueTree sourceChild = treeToLoad.getChild(i);
-			ValueTree destinationChild = theSequencerTree.getChild(i);
-			destinationChild.copyPropertiesFrom(sourceChild, nullptr);
-		}
+		theSequencerView->resetAll();
 	}
 }
 

diff --git a/Source/SequencerView.cpp b/Source/SequencerView.cpp
@@ -377,6 +377,18 @@ void SequencerView::randomiseAll()
 	}
 }
 
+void SequencerView::resetAll()
+{
+	for (int i=0;i<theSequencerTree.getNumChildren();i++)
+	{
+		ValueTree child = theSequencerTree.getChild(i);
+		if (theSequencerTree.getProperty("RandPitch")) child.setProperty("Pitch", 0, theUndoManager);
+		if (theSequencerTree.getProperty("RandState")) child.setProperty("State", ON, theUndoManager);
+		if (theSequencerTree.getProperty("RandVelocity")) child.setProperty("Velocity", 127, theUndoManager);
+		if (theSequencerTree.getProperty("RandDecay")) child.setProperty("Decay", 40, theUndoManager);
+	}
+}
+
 void SequencerView::setAllLeds(bool state)
 {
 	for (int i=0;i<theLEDs.size();i++)

diff --git a/Source/SequencerView.h b/Source/SequencerView.h
@@ -48,6 +48,7 @@ class SequencerView: public Component, SliderListener, public ButtonListener, As
 	void handleAsyncUpdate();
 	void updateSelectedMidiOut(String& midiOut);
 	void randomiseAll();
+	void resetAll();
 	bool keyPressed(const KeyPress &key, Component *originatingComponent)
 	{
 		if (key.isKeyCode(82)) randomiseAll();
@@ -69,8 +70,8 @@ class SequencerView: public Component, SliderListener, public ButtonListener, As
 		g.drawText("Division", widthDiv * 26, heigthDiv * 3, widthDiv * 5, heigthDiv * 2, Justification::centred, 1);
 		g.drawText("Shuffle", widthDiv * 33, heigthDiv * 3, widthDiv * 10, heigthDiv * 2, Justification::centred, 1);
 		g.drawText("Range", widthDiv * 45, heigthDiv * 3, widthDiv * 6, heigthDiv * 2, Justification::centred, 1);
-		g.drawText("Offset", widthDiv * 53, heigthDiv * 3, widthDiv * 4, heigthDiv * 2, Justification::centred, 1);
-		g.drawText("Length", widthDiv * 57, heigthDiv * 3, widthDiv * 4, heigthDiv * 2, Justification::centred, 1);
+		g.drawText("Offset", widthDiv * 52, heigthDiv * 3, widthDiv * 4, heigthDiv * 2, Justification::centred, 1);
+		g.drawText("Length", widthDiv * 55.5f, heigthDiv * 3, widthDiv * 4, heigthDiv * 2, Justification::centred, 1);
 		g.drawText("Midi output", widthDiv * 102, heigthDiv * 3, widthDiv * 12, heigthDiv * 2, Justification::centred, 1);
 		g.drawText("Channel", widthDiv * 114, heigthDiv * 3, widthDiv * 5, heigthDiv * 2, Justification::centred, 1);
 

diff --git a/Steps.jucer b/Steps.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="i0GMhV" name="Steps" projectType="guiapp" version="1.3.4"
+<JUCERPROJECT id="i0GMhV" name="Steps" projectType="guiapp" version="1.3.5"
               bundleIdentifier="com.nummer.steps" includeBinaryInAppConfig="1"
               jucerVersion="3.1.0" companyWebsite="www.nummermusic.com" companyEmail="[email protected]"
               companyName="Nummer">