jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1726 from amarjeetkapoor1/parameterASTmaster

Browse source 
support of negative numbers in parameters in slider
This commit is contained in:
amarjeet singh kapoor 2016-07-03 18:54:18 +01:00 committed by GitHub
commit e7446aa51a
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Parameter/parameterslider.cpp
View file

@ -26,8 +26,9 @@ void ParameterSlider::on_Changed(int)
void ParameterSlider::setValue()
{
this->stackedWidget->setCurrentWidget(this->pageSlider);
this->slider->setMaximum(object->values->toRange().end_value());
this->slider->setRange(object->values->toRange().begin_value(),object->values->toRange().end_value());
this->slider->setValue(object->value->toDouble());
this->slider->setMinimum(object->values->toRange().begin_value());
this->slider->setSingleStep(object->values->toRange().step_value());
this->labelSliderValue->setText(QString::number(object->value->toDouble(), 'f', 0));
}

6
src/comment_lexer.l
View file

@ -16,9 +16,9 @@ H [0-9a-fA-F]
%%
{D}+{E}? |
{D}*\.{D}+{E}? |
{D}+\.{D}*{E}? {
[+-]?{D}+{E}? |
[+-]?{D}*\.{D}+{E}? |
[+-]?{D}+\.{D}*{E}? {
try {
yylval.num = boost::lexical_cast<double>(yytext);
return NUM;