Skip to content

Made "Feedback" inherit from parent if empty #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
richardwilliamson wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Made "Feedback" inherit from parent if empty #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6a7fdf
Made "Feedback" inherit from parent if empty
richardwilliamson Apr 7, 2016
4afe116
Added in wildcards + should work on all widgets
richardwilliamson Apr 9, 2016
323c26c
Merge remote-tracking branch 'ElectronicTheatreControlsLabs/master' i…
richardwilliamson Apr 9, 2016
a0385a1
fixed after merging master into branch
richardwilliamson Apr 10, 2016
7494e99
Added up/down to widgets and some other stuff
richardwilliamson Apr 10, 2016
9392e89
Made it work properly
richardwilliamson Apr 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

OSCWidgets.xcodeproj/xcuserdata/richard.xcuserdatad/xcschemes/xcschememanagement.plist

OSCWidgets.xcodeproj/project.pbxproj

OSCWidgets.xcodeproj/project.xcworkspace/contents.xcworkspacedata

OSCWidgets.xcodeproj/project.xcworkspace/xcshareddata/OSCWidgets.xcscmblueprint

OSCWidgets.xcodeproj/project.pbxproj

OSCWidgets.xcodeproj/project.pbxproj

OSCWidgets.xcodeproj/project.xcworkspace/xcuserdata/richard.xcuserdatad/UserInterfaceState.xcuserstate

OSCWidgets.xcodeproj/xcuserdata/richard.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

OSCWidgets.xcodeproj/xcuserdata/richard.xcuserdatad/xcschemes/OSCWidgets.xcscheme

OSCWidgets.xcodeproj/project.pbxproj

*.pbxproj

OSCWidgets.xcodeproj/project.pbxproj
100 changes: 52 additions & 48 deletions OSCWidgets.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 13 additions & 6 deletions OSCWidgets/EditPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,10 @@ void EditPanel::GetText(QString &text) const

////////////////////////////////////////////////////////////////////////////////

void EditPanel::SetText(const QString &text)
void EditPanel::SetText(const QString &text, const QString &placeholder)
{
m_Text->setText(text);
m_Text->setPlaceholderText(placeholder);
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -473,10 +474,11 @@ void EditPanel::GetPath(QString &path) const

////////////////////////////////////////////////////////////////////////////////

void EditPanel::SetPath(const QString &path)
void EditPanel::SetPath(const QString &path, const QString &placeholder)
{
m_IgnoreEdits++;
m_Path->setText(path);
m_Path->setPlaceholderText(placeholder);
m_IgnoreEdits--;

UpdateLocal(/*primaryPath*/true);
Expand All @@ -500,10 +502,11 @@ void EditPanel::GetPath2(QString &path) const

////////////////////////////////////////////////////////////////////////////////

void EditPanel::SetPath2(const QString &path)
void EditPanel::SetPath2(const QString &path, const QString &placeholder)
{
m_IgnoreEdits++;
m_Path2->setText(path);
m_Path2->setPlaceholderText(placeholder);
m_IgnoreEdits--;

UpdateLocal(/*primaryPath*/false);
Expand All @@ -527,9 +530,10 @@ void EditPanel::GetLabelPath(QString &labelPath) const

////////////////////////////////////////////////////////////////////////////////

void EditPanel::SetLabelPath(const QString &labelPath)
void EditPanel::SetLabelPath(const QString &labelPath, const QString &placeholder)
{
m_LabelPath->setText(labelPath);
m_LabelPath->setPlaceholderText(placeholder);
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -549,9 +553,11 @@ void EditPanel::GetFeedbackPath(QString &feedbackPath) const

////////////////////////////////////////////////////////////////////////////////

void EditPanel::SetFeedbackPath(const QString &feedbackPath)
void EditPanel::SetFeedbackPath(const QString &feedbackPath, const QString &placeholderText)
{
m_FeedbackPath->setText(feedbackPath);
m_FeedbackPath->setPlaceholderText(placeholderText);

}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -571,9 +577,10 @@ void EditPanel::GetTriggerPath(QString &triggerPath) const

////////////////////////////////////////////////////////////////////////////////

void EditPanel::SetTriggerPath(const QString &triggerPath)
void EditPanel::SetTriggerPath(const QString &triggerPath, const QString &placeholder)
{
m_TriggerPath->setText(triggerPath);
m_TriggerPath->setPlaceholderText(placeholder);
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
12 changes: 6 additions & 6 deletions OSCWidgets/EditPanel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,26 @@ class EditPanel
virtual void SetHidden(bool b);
virtual void SetHiddenEnabled(bool b);
virtual void GetText(QString &text) const;
virtual void SetText(const QString &text);
virtual void SetText(const QString &text, const QString &placeholder);
virtual void GetImagePath(QString &imagePath) const;
virtual void SetImagePath(const QString &imagePath);
virtual void GetImagePath2(QString &imagePath2) const;
virtual void SetImagePath2(const QString &imagePath2);
virtual void SetImagePath2Enabled(bool b);
virtual void GetPath(QString &path) const;
virtual void SetPath(const QString &path);
virtual void SetPath(const QString &path, const QString &placeholder);
virtual void SetPathEnabled(bool b);
virtual void GetPath2(QString &path) const;
virtual void SetPath2(const QString &path);
virtual void SetPath2(const QString &path, const QString &placeholder);
virtual void SetPath2Enabled(bool b);
virtual void GetLabelPath(QString &labelPath) const;
virtual void SetLabelPath(const QString &labelPath);
virtual void SetLabelPath(const QString &labelPath, const QString &placeholder);
virtual void SetLabelPathEnabled(bool b);
virtual void GetFeedbackPath(QString &feedbackPath) const;
virtual void SetFeedbackPath(const QString &feedbackPath);
virtual void SetFeedbackPath(const QString &feedbackPath, const QString &placeholderText);
virtual void SetFeedbackPathEnabled(bool b);
virtual void GetTriggerPath(QString &triggerPath) const;
virtual void SetTriggerPath(const QString &triggerPath);
virtual void SetTriggerPath(const QString &triggerPath, const QString &placeholder);
virtual void SetTriggerPathEnabled(bool b);
virtual void GetColor(QColor &color) const;
virtual void SetColor(const QColor &color);
Expand Down
17 changes: 12 additions & 5 deletions OSCWidgets/ToyActivity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ float FadeActivity::GetFadePercent() const
void FadeActivity::onUpdate()
{
m_FadeElapsed += m_ActivityEosTimer.Restart();

switch( m_FadeState )
{
case FADE_IN:
Expand Down Expand Up @@ -225,6 +225,9 @@ void FadeActivity::onUpdate()

void FadeActivity::paintEvent(QPaintEvent* /*event*/)
{

SetText(((ToyActivityWidget*)parent())->GetText()); //PUTTING THIS HERE IS BAD BUT I DON'T KNOW WHAT ELSE TO DO!!

QRectF r( rect() );
r.adjust(1, 1, -1, -1);

Expand Down Expand Up @@ -257,6 +260,7 @@ void FadeActivity::paintEvent(QPaintEvent* /*event*/)
}

QColor textColor( palette().color(QPalette::ButtonText) );


if( !text().isEmpty() )
{
Expand Down Expand Up @@ -317,7 +321,7 @@ ToyActivityWidget::ToyActivityWidget(QWidget *parent)
void ToyActivityWidget::SetText(const QString &text)
{
ToyWidget::SetText(text);
static_cast<FadeActivity*>(m_Widget)->setText(m_Text);
static_cast<FadeActivity*>(m_Widget)->setText(GetText());
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -418,7 +422,9 @@ void ToyActivityWidget::MakeFadeTiming(bool flash, FadeActivity::sFadeTiming &fa

void ToyActivityWidget::Recv(const QString &path, const OSCArgument *args, size_t count)
{
if(path == m_FeedbackPath)


if(path == GetFeedbackPath())
{
FadeActivity *activity = static_cast<FadeActivity*>(m_Widget);

Expand Down Expand Up @@ -492,8 +498,9 @@ void ToyActivityGrid::ApplyDefaultSettings(ToyWidget *widget, size_t index)
QString pathName;
Toy::GetDefaultPathName(m_Type, pathName);

QString path = QString("/%1/%2").arg(pathName).arg(index);
widget->SetFeedbackPath(path);
//QString path = QString("/%1/{n1}").arg(pathName);
widget->SetFeedbackPath("");
SetFeedbackPath(QString("/%1/{n1}").arg(pathName));
}

////////////////////////////////////////////////////////////////////////////////
8 changes: 4 additions & 4 deletions OSCWidgets/ToyButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ToyButtonWidget::ToyButtonWidget(QWidget *parent)
void ToyButtonWidget::SetText(const QString &text)
{
ToyWidget::SetText(text);
static_cast<FadeButton*>(m_Widget)->setText(m_Text);
static_cast<FadeButton*>(m_Widget)->setText(GetText());
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -141,8 +141,8 @@ void ToyButtonWidget::Recv(const QString &path, const OSCArgument *args, size_t
{
FadeButton *button = static_cast<FadeButton*>(m_Widget);

bool isFeedback = (path == m_FeedbackPath);
bool isTrigger = (!isFeedback && path==m_TriggerPath);
bool isFeedback = (path == GetFeedbackPath());
bool isTrigger = (!isFeedback && path==GetTriggerPath());
if(isFeedback || isTrigger)
{
bool toggle = false;
Expand Down Expand Up @@ -184,7 +184,7 @@ void ToyButtonWidget::Recv(const QString &path, const OSCArgument *args, size_t
}
}
else
{
{ //not feedback or trigger, so label..
std::string str;
if(args && count>0)
{
Expand Down
2 changes: 1 addition & 1 deletion OSCWidgets/ToyCmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void ToyCmdWidget::SetTextColor(const QColor &textColor)

void ToyCmdWidget::Recv(const QString &path, const OSCArgument *args, size_t count)
{
if(path == m_TriggerPath)
if(path == GetTriggerPath())
{
bool edge = false;

Expand Down
6 changes: 4 additions & 2 deletions OSCWidgets/ToyEncoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ void FadeEncoder::mouseReleaseEvent(QMouseEvent *event)
void FadeEncoder::paintEvent(QPaintEvent* /*event*/)
{
m_Canvas.fill(0);

SetText(((ToyEncoderWidget*)parent())->GetText()); //TODO BAD PLACE FOR THIS TO HAPPEN!!

QPainter painter;
if( painter.begin(&m_Canvas) )
Expand Down Expand Up @@ -330,7 +332,7 @@ ToyEncoderWidget::ToyEncoderWidget(QWidget *parent)
void ToyEncoderWidget::SetText(const QString &text)
{
ToyWidget::SetText(text);
static_cast<FadeEncoder*>(m_Widget)->SetText(m_Text);
static_cast<FadeEncoder*>(m_Widget)->SetText(GetText());
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -372,7 +374,7 @@ void ToyEncoderWidget::SetLabel(const QString &label)

void ToyEncoderWidget::Recv(const QString &path, const OSCArgument *args, size_t count)
{
if(path == m_TriggerPath)
if(path == GetTriggerPath())
{
FadeEncoder *encoder = static_cast<FadeEncoder*>(m_Widget);

Expand Down
6 changes: 4 additions & 2 deletions OSCWidgets/ToyFlicker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ void FadeFlicker::resizeEvent(QResizeEvent *event)
void FadeFlicker::paintEvent(QPaintEvent* /*event*/)
{
QPainter painter(this);

SetText(((ToyFlickerWidget*)parent())->GetText()); //TODO BAD RICHARD

painter.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing);

Expand Down Expand Up @@ -318,7 +320,7 @@ ToyFlickerWidget::ToyFlickerWidget(QWidget *parent)
void ToyFlickerWidget::SetText(const QString &text)
{
ToyWidget::SetText(text);
static_cast<FadeFlicker*>(m_Widget)->SetText(m_Text);
static_cast<FadeFlicker*>(m_Widget)->SetText(GetText());
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -409,7 +411,7 @@ void ToyFlickerWidget::SetLabel(const QString &label)

void ToyFlickerWidget::Recv(const QString &path, const OSCArgument *args, size_t count)
{
if(path == m_TriggerPath)
if(path == GetTriggerPath())
{
bool paused = false;

Expand Down
Loading