allanger/paulxstretch
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 2 Activity

More breakpoint envelope renaming

Browse Source
This commit is contained in:
xenakios 2018-10-17 13:14:07 +03:00
parent 007cc1cded
commit 3f0f105565
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/envelope_component.cpp
View File

@ -94,7 +94,7 @@ void EnvelopeComponent::paint(Graphics& g)
g.setColour(envcolor); g.setColour(envcolor);
double y0 = 0.0; double y0 = 0.0;
if (drawTransformed==false) if (drawTransformed==false)
y0 = m_envelope->GetInterpolatedNodeValue(0.0); y0 = m_envelope->GetInterpolatedEnvelopeValue(0.0);
else y0 = m_envelope->getTransformedValue(0.0); else y0 = m_envelope->getTransformedValue(0.0);
const int drawstep = 1; const int drawstep = 1;
for (int i = 1; i < getWidth(); ++i) for (int i = 1; i < getWidth(); ++i)
@ -102,7 +102,7 @@ void EnvelopeComponent::paint(Graphics& g)
double env_x = 1.0 / getWidth()*i; double env_x = 1.0 / getWidth()*i;
double y1 = 0.0; double y1 = 0.0;
if (drawTransformed==false) if (drawTransformed==false)
y1 = m_envelope->GetInterpolatedNodeValue(env_x); y1 = m_envelope->GetInterpolatedEnvelopeValue(env_x);
else y1 = m_envelope->getTransformedValue(env_x); else y1 = m_envelope->getTransformedValue(env_x);
double foo_y0 = (double)getHeight() - jmap<double>(y0, m_view_start_value, m_view_end_value, 0.0, getHeight()); double foo_y0 = (double)getHeight() - jmap<double>(y0, m_view_start_value, m_view_end_value, 0.0, getHeight());
double foo_y1 = (double)getHeight() - jmap<double>(y1, m_view_start_value, m_view_end_value, 0.0, getHeight()); double foo_y1 = (double)getHeight() - jmap<double>(y1, m_view_start_value, m_view_end_value, 0.0, getHeight());
@ -112,7 +112,7 @@ void EnvelopeComponent::paint(Graphics& g)
}; };
draw_env(m_env_color, false, 1.0f); draw_env(m_env_color, false, 1.0f);
draw_env(Colours::aquamarine.darker(), true, 1.0f); draw_env(Colours::aquamarine.darker(), true, 1.0f);
for (int i = 0; i < m_envelope->GetNumNodes(); ++i) for (int i = 0; i < m_envelope->GetNumPoints(); ++i)
{ {
const envelope_point& pt = m_envelope->GetNodeAtIndex(i); const envelope_point& pt = m_envelope->GetNodeAtIndex(i);
double xcor = jmap(pt.pt_x, m_view_start_time, m_view_end_time, 0.0, (double)getWidth()); double xcor = jmap(pt.pt_x, m_view_start_time, m_view_end_time, 0.0, (double)getWidth());
@ -177,7 +177,7 @@ void EnvelopeComponent::mouseDrag(const MouseEvent& ev)
{ {
left_bound = m_envelope->GetNodeAtIndex(m_node_to_drag - 1).pt_x; left_bound = m_envelope->GetNodeAtIndex(m_node_to_drag - 1).pt_x;
} }
if (m_node_to_drag < m_envelope->GetNumNodes() - 1) if (m_node_to_drag < m_envelope->GetNumPoints() - 1)
{ {
right_bound = m_envelope->GetNodeAtIndex(m_node_to_drag + 1).pt_x; right_bound = m_envelope->GetNodeAtIndex(m_node_to_drag + 1).pt_x;
} }
@ -237,7 +237,7 @@ void EnvelopeComponent::mouseDown(const MouseEvent & ev)
} }
if (r == 2) if (r == 2)
{ {
for (int i = 0; i < m_envelope->GetNumNodes(); ++i) for (int i = 0; i < m_envelope->GetNumPoints(); ++i)
{ {
double val = 1.0 - m_envelope->GetNodeAtIndex(i).pt_y; double val = 1.0 - m_envelope->GetNodeAtIndex(i).pt_y;
m_envelope->GetNodeAtIndex(i).pt_y = val; m_envelope->GetNodeAtIndex(i).pt_y = val;
@ -264,7 +264,7 @@ void EnvelopeComponent::mouseDown(const MouseEvent & ev)
} }
if (m_node_to_drag >= 0 && ev.mods.isAltDown() == true) if (m_node_to_drag >= 0 && ev.mods.isAltDown() == true)
{ {
if (m_envelope->GetNumNodes() < 2) if (m_envelope->GetNumPoints() < 2)
{ {
m_bubble.showAt({ ev.x,ev.y, 0,0 }, AttributedString("Can't remove last node"), 3000, false, false); m_bubble.showAt({ ev.x,ev.y, 0,0 }, AttributedString("Can't remove last node"), 3000, false, false);
return; return;
@ -376,7 +376,7 @@ bool EnvelopeComponent::keyPressed(const KeyPress & ev)
{ {
ScopedLock locker(*m_cs); ScopedLock locker(*m_cs);
m_envelope->removePointsConditionally([](const envelope_point& pt) { return pt.Status == 1; }); m_envelope->removePointsConditionally([](const envelope_point& pt) { return pt.Status == 1; });
if (m_envelope->GetNumNodes() == 0) if (m_envelope->GetNumPoints() == 0)
m_envelope->AddNode({ 0.0,0.5 }); m_envelope->AddNode({ 0.0,0.5 });
} }
repaint(); repaint();
@ -390,7 +390,7 @@ int EnvelopeComponent::find_hot_envelope_point(double xcor, double ycor)
{ {
if (m_envelope == nullptr) if (m_envelope == nullptr)
return -1; return -1;
for (int i = 0; i < m_envelope->GetNumNodes(); ++i) for (int i = 0; i < m_envelope->GetNumPoints(); ++i)
{ {
const envelope_point& pt = m_envelope->GetNodeAtIndex(i); const envelope_point& pt = m_envelope->GetNodeAtIndex(i);
double ptxcor = jmap(pt.pt_x, m_view_start_time, m_view_end_time, 0.0, (double)getWidth()); double ptxcor = jmap(pt.pt_x, m_view_start_time, m_view_end_time, 0.0, (double)getWidth());
@ -408,7 +408,7 @@ int EnvelopeComponent::findHotEnvelopeSegment(double xcor, double ycor, bool det
{ {
if (m_envelope == nullptr) if (m_envelope == nullptr)
return -1; return -1;
for (int i = 0; i < m_envelope->GetNumNodes()-1; ++i) for (int i = 0; i < m_envelope->GetNumPoints()-1; ++i)
{ {
const envelope_point& pt0 = m_envelope->GetNodeAtIndex(i); const envelope_point& pt0 = m_envelope->GetNodeAtIndex(i);
const envelope_point& pt1 = m_envelope->GetNodeAtIndex(i+1); const envelope_point& pt1 = m_envelope->GetNodeAtIndex(i+1);
@ -423,7 +423,7 @@ int EnvelopeComponent::findHotEnvelopeSegment(double xcor, double ycor, bool det
else else
{ {
double normx = jmap<double>(xcor, 0.0, getWidth(), m_view_start_time, m_view_end_time); double normx = jmap<double>(xcor, 0.0, getWidth(), m_view_start_time, m_view_end_time);
double yval = m_envelope->GetInterpolatedNodeValue(normx); double yval = m_envelope->GetInterpolatedEnvelopeValue(normx);
float ycor0 = (float)(getHeight()-jmap<double>(yval, 0.0, 1.0, 0.0, getHeight())); float ycor0 = (float)(getHeight()-jmap<double>(yval, 0.0, 1.0, 0.0, getHeight()));
juce::Rectangle<float> segrect2((float)(xcor - 20), (float)(ycor - 10), 40, 20); juce::Rectangle<float> segrect2((float)(xcor - 20), (float)(ycor - 10), 40, 20);
if (segrect2.contains((float)xcor, ycor0)) if (segrect2.contains((float)xcor, ycor0))

14
Source/jcdp_envelope.h
View File

@ -149,7 +149,7 @@ inline double get_shaped_value(double x, int, double p1, double)
using nodes_t=std::vector<envelope_point>; using nodes_t=std::vector<envelope_point>;
inline double GetInterpolatedNodeValue(const nodes_t& m_nodes, double atime, double m_defvalue=0.5) inline double GetInterpolatedEnvelopeValue(const nodes_t& m_nodes, double atime, double m_defvalue=0.5)
{ {
int maxnodeind=(int)m_nodes.size()-1; int maxnodeind=(int)m_nodes.size()-1;
if (m_nodes.size()==0) return m_defvalue; if (m_nodes.size()==0) return m_defvalue;
@ -271,7 +271,7 @@ public:
return MD5(mb); return MD5(mb);
} }
int GetNumNodes() const { return (int)m_nodes.size(); } int GetNumPoints() const { return (int)m_nodes.size(); }
void SetDefShape(int value) { m_defshape=value; } void SetDefShape(int value) { m_defshape=value; }
double getNodeLeftBound(int index, double margin=0.01) const noexcept double getNodeLeftBound(int index, double margin=0.01) const noexcept
{ {
@ -407,7 +407,7 @@ public:
} }
double GetInterpolatedNodeValue(double atime) const double GetInterpolatedEnvelopeValue(double atime) const
{ {
double t0=0.0; double t0=0.0;
double t1=0.0; double t1=0.0;
@ -567,9 +567,9 @@ public:
for (int j=0;j<numsegments;++j) for (int j=0;j<numsegments;++j)
{ {
double cb_x0 = pt0.pt_x + xdiff / (numsegments)*j; double cb_x0 = pt0.pt_x + xdiff / (numsegments)*j;
double cb_y0 = GetInterpolatedNodeValue(cb_x0); double cb_y0 = GetInterpolatedEnvelopeValue(cb_x0);
double cb_x1 = pt0.pt_x + xdiff / (numsegments)*(j+1); double cb_x1 = pt0.pt_x + xdiff / (numsegments)*(j+1);
double cb_y1 = GetInterpolatedNodeValue(cb_x1); double cb_y1 = GetInterpolatedEnvelopeValue(cb_x1);
handlesegmentfunc(cb_x0, cb_y0,cb_x1,cb_y1); handlesegmentfunc(cb_x0, cb_y0,cb_x1,cb_y1);
} }
} }
@ -591,7 +591,7 @@ public:
inline double getTransformedValue(double x) inline double getTransformedValue(double x)
{ {
if (isTransformed() == false) if (isTransformed() == false)
return GetInterpolatedNodeValue(x); return GetInterpolatedEnvelopeValue(x);
double temp = x-m_transform_x_shift; double temp = x-m_transform_x_shift;
if (m_transform_wrap_x == true) if (m_transform_wrap_x == true)
{ {
@ -599,7 +599,7 @@ public:
if (temp < 0.0) if (temp < 0.0)
temp += 1.0; temp += 1.0;
} }
double v = GetInterpolatedNodeValue(temp); double v = GetInterpolatedEnvelopeValue(temp);
double center_v = m_minvalue + (m_maxvalue - m_minvalue) / 2.0; double center_v = m_minvalue + (m_maxvalue - m_minvalue) / 2.0;
double diff = center_v - v; double diff = center_v - v;
double scaled = center_v - m_transform_y_scale * diff; double scaled = center_v - m_transform_y_scale * diff;