Skip to content

Commit

Permalink
Using Arial Currently to avoid embedding font right now
Browse files Browse the repository at this point in the history
  • Loading branch information
Joseph Lyons authored and Joseph Lyons committed May 12, 2017
1 parent db3f425 commit bf9dbd5
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 84 deletions.
8 changes: 5 additions & 3 deletions Delay Time Calculator.jucer
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<MAINGROUP id="wVdkZw" name="The Lyons' Den Delay Time Calculator">
<GROUP id="{35A3474B-79D8-920E-E136-88F8E58081F5}" name="Source">
<GROUP id="{5249329C-49CC-44BF-F4E5-1D704800FEA9}" name="Font">
<FILE id="lN1ly9" name="Calisto MT" compile="0" resource="1" file="Font/Calisto MT"/>
<FILE id="be4TN6" name="CalistoMT.ttf" compile="0" resource="1" file="Font/CalistoMT.ttf"/>
</GROUP>
<GROUP id="{0496FE9B-6CEE-7E75-C0FB-3F0DB683F2AD}" name="Pixelmator">
<FILE id="dc3z5K" name="AppIcon.png" compile="0" resource="1" file="Pixelmator/AppIcon.png"/>
Expand Down Expand Up @@ -36,8 +36,10 @@
<FILE id="nHwMjs" name="HertzValues.cpp" compile="1" resource="0" file="Source/HertzValues.cpp"/>
<FILE id="WpUudQ" name="TapTempo.hpp" compile="0" resource="0" file="Source/TapTempo.hpp"/>
<FILE id="YOxrbs" name="TapTempo.cpp" compile="1" resource="0" file="Source/TapTempo.cpp"/>
<FILE id="uAB51F" name="Fonts.hpp" compile="0" resource="0" file="Source/Fonts.hpp"/>
<FILE id="JiVDlx" name="Fonts.cpp" compile="1" resource="0" file="Source/Fonts.cpp"/>
<FILE id="Vtcnce" name="EmbeddedFonts.hpp" compile="0" resource="0"
file="Source/EmbeddedFonts.hpp"/>
<FILE id="XxZUNi" name="EmbeddedFonts.cpp" compile="1" resource="0"
file="Source/EmbeddedFonts.cpp"/>
</GROUP>
</MAINGROUP>
<EXPORTFORMATS>
Expand Down
File renamed without changes.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ A simple application that calculates delay and reverb pre-delay times based on t
## Features still to add:

* Scaleable UI
* Embed custom font
* Analyze MusicMath features
* Remove slider and use a text box that can be changed by clicking and dragging?
* Change to whole BPM values and use modifier buttons to access 1/10th notes (or any other method to access these values?
Expand All @@ -33,6 +34,7 @@ A simple application that calculates delay and reverb pre-delay times based on t
2. Added option to display values in Hertz - to set LFOs on your synths
3. Added key support for changing from ms to Hz (using keys 'M' and 'H' respectively)
4. Made information section a text editor instead of a label so I can add more information to this and take advantage of scrolling, vesus having to make the GUI taller each line I add.
5. Switched font to Arial for the time being since I can't seem to figure how to embed fonts in JUCE. I wanted to get this update out to fix the current bugs, so I'm just using a 'safe' font that should be on everyone's system.'

### May 09, 2017 - V 1.3:
1. Keys: 1 = 1/2x, 2 = 2x, T = Tap Tempo, R = Reset Tap Tempo, Spacebar = Round Value, Up Arrow = +1, Down Arrow = -1, Right Arrow = +5, Left Arrow = -5;
Expand Down
22 changes: 22 additions & 0 deletions Source/EmbeddedFonts.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// EmbeddedFonts.cpp
// The Lyons' Den Delay Time Calculator
//
// Created by Joseph Lyons on 5/9/17.
//
//

// Dismiss this file until future versions that will have embedded fonts

#include "EmbeddedFonts.hpp"

EmbeddedFonts::EmbeddedFonts()
{
calistoMT = Font(Typeface::createSystemTypefaceFor(BinaryData::CalistoMT_ttf,
BinaryData::CalistoMT_ttfSize));
}

Font& EmbeddedFonts::getCalistoMT()
{
return calistoMT;
}
48 changes: 48 additions & 0 deletions Source/EmbeddedFonts.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//
// EmbeddedFonts.hpp
// The Lyons' Den Delay Time Calculator
//
// Created by Joseph Lyons on 5/9/17.
//
//

#ifndef EmbeddedFonts_hpp
#define EmbeddedFonts_hpp

#include "../JuceLibraryCode/JuceHeader.h"

// Dismiss this file until future versions that will have embedded fonts

class EmbeddedFonts
{
private:
static ScopedPointer<EmbeddedFonts> instance_;
Font calistoMT;

public:
EmbeddedFonts();

static EmbeddedFonts* instance()
{
static EmbeddedFonts instance;
return &instance;
}

Font& getCalistoMT();
};

//struct CalistoMT
//{
// Font font;
//
// CalistoMT()
// {
// Typeface::Ptr ptr = Typeface::createSystemTypefaceFor(BinaryData::Calisto_MT,
// BinaryData::Calisto_MTSize);
//
// font = Font(ptr);
// }
//};


#endif /* EmbeddedFonts_hpp */
15 changes: 0 additions & 15 deletions Source/Fonts.cpp

This file was deleted.

37 changes: 0 additions & 37 deletions Source/Fonts.hpp

This file was deleted.

4 changes: 2 additions & 2 deletions Source/InformationComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ InformationComponent::InformationComponent ()

addAndMakeVisible (informationLabel = new Label ("informationLabel",
TRANS("Information")));
informationLabel->setFont (Font ("Calisto MT", 47.40f, Font::plain).withTypefaceStyle ("Regular").withExtraKerningFactor (0.043f));
informationLabel->setFont (Font ("Arial", 47.40f, Font::plain).withTypefaceStyle ("Regular").withExtraKerningFactor (0.043f));
informationLabel->setJustificationType (Justification::centred);
informationLabel->setEditable (false, false, false);
informationLabel->setColour (Label::textColourId, Colour (0xffadaaaa));
Expand Down Expand Up @@ -164,7 +164,7 @@ BEGIN_JUCER_METADATA
<LABEL name="informationLabel" id="951f8323b93b29f2" memberName="informationLabel"
virtualName="" explicitFocusOrder="0" pos="0 0 240 50" textCol="ffadaaaa"
edTextCol="ff000000" edBkgCol="0" labelText="Information" editableSingleClick="0"
editableDoubleClick="0" focusDiscardsChanges="0" fontname="Calisto MT"
editableDoubleClick="0" focusDiscardsChanges="0" fontname="Arial"
fontsize="47.399999999999998579" kerning="0.042999999999999996558"
bold="0" italic="0" justification="36"/>
<LABEL name="versionNumberLabel" id="30f8922fa9ce43fc" memberName="versionNumberLabelOutput"
Expand Down
Loading

0 comments on commit bf9dbd5

Please sign in to comment.