From 8a586c6035397d4db2e11234072889571b56314e Mon Sep 17 00:00:00 2001 From: amarjeetkapoor1 Date: Mon, 30 May 2016 22:43:19 +0530 Subject: [PATCH] removed initialization from header --- examples/Parametric/sign.scad | 29 ----------------------------- src/ParameterWidget.cc | 1 + src/ParameterWidget.h | 2 +- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 examples/Parametric/sign.scad diff --git a/examples/Parametric/sign.scad b/examples/Parametric/sign.scad deleted file mode 100644 index 735e434d..00000000 --- a/examples/Parametric/sign.scad +++ /dev/null @@ -1,29 +0,0 @@ -@Description("The resolution of the curves. Higher values give smoother curves but may increase the model render time.") -@Parameter([10, 20, 30, 50, 100]) -resolution = 30; - -@Description("The horizontal radius of the outer ellipse of the sign.") -@Parameter([60 : 200]) -radius = 80; - -@Parameter([1 : 10]) -@Description("Total height of the sign") -height = 2; - -@Parameter(["Welcome to...", "Happy Birthday!", "Happy Anniversary", "Congratulations", "Thank You"]) -selection = "Welcome to..."; - -@Parameter() -text = "Parametric Designs"; - -$fn = resolution; - -scale([1, 0.5]) difference() { - cylinder(r = radius, h = 2 * height, center = true); - translate([0, 0, height]) - cylinder(r = radius - 10, h = height + 1, center = true); -} -linear_extrude(height = height) { - translate([0, --4]) text(selection, halign = "center"); - translate([0, -16]) text(text, halign = "center"); -} diff --git a/src/ParameterWidget.cc b/src/ParameterWidget.cc index e199dd87..6baa0951 100644 --- a/src/ParameterWidget.cc +++ b/src/ParameterWidget.cc @@ -42,6 +42,7 @@ ParameterWidget::ParameterWidget(QWidget *parent) : QWidget(parent) { setupUi(this); + descriptionShow=true; autoPreviewTimer.setInterval(500); autoPreviewTimer.setSingleShot(true); connect(&autoPreviewTimer, SIGNAL(timeout()), this, SLOT(onPreviewTimerElapsed())); diff --git a/src/ParameterWidget.h b/src/ParameterWidget.h index 9b54c6cf..47528295 100644 --- a/src/ParameterWidget.h +++ b/src/ParameterWidget.h @@ -37,7 +37,7 @@ class ParameterWidget : public QWidget, public Ui::ParameterWidget, public Param typedef enum { UNDEFINED, COMBOBOX, SLIDER, CHECKBOX, TEXT, NUMBER, VECTOR } parameter_type_t; QTimer autoPreviewTimer; - bool descriptionShow=true; + bool descriptionShow; public: ParameterWidget(QWidget *parent = 0);