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

bug related to ComboBox solved

Browse source
This commit is contained in:
amarjeetkapoor1 2016-05-26 15:03:34 +05:30
parent e91e9ebf04
commit c2c7dd0b7b
2 changed files with 46 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ParameterEntryWidget.cc
View file

@ -40,8 +40,13 @@ ParameterEntryWidget::~ParameterEntryWidget()
void ParameterEntryWidget::on_comboBox_activated(int idx)
{
const Value *v = (const Value *)comboBox->itemData(idx).value<void *>();
object->value = ValuePtr(*v);
if(object->dvt == Value::STRING){
const string v = comboBox->currentText().toUtf8().constData();
object->value = ValuePtr(v);
}else{
const double v = comboBox->currentText().toDouble();
object->value = ValuePtr(v);
}
emit changed();
}

62
src/ParameterWidget.ui
View file

@ -14,14 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="2">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>+</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="6" column="0">
<widget class="QComboBox" name="comboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -31,21 +24,14 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_2">
<item row="6" column="1">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>-</string>
<string>+</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="text">
<string>Preset:</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<item row="10" column="0" colspan="4">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
@ -55,22 +41,38 @@
<rect>
<x>0</x>
<y>0</y>
<width>466</width>
<height>456</height>
<width>472</width>
<height>502</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
</widget>
</item>
<item row="0" column="0" colspan="3">
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Preset:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxAutoPreview">
<property name="text">
<string>Automatic Preview</string>
@ -80,6 +82,20 @@
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>-</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Detailed descritpion</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>