← Back to branch summary

~ubuntu-branches/ubuntu/precise/fritzing/precise

« back to all changes in this revision

Viewing changes to src/items/capacitor.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Georges Khaznadar
  • Date: 2011-08-26 10:11:05 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110826101105-w5hmn7zcf93ig5v6
Tags: 0.6.3b-1
http://bugs.debian.org/636441
http://bugs.debian.org/636061
* upgrapded to the newer upstream version
* parameters of the function GraphicsUtils::distanceFromLine in 
  src/svg/groundplanegenerator.cpp:767 are now declared as doubles,
  which Closes: #636441
* the new version fixes src/utils/folderutils.cpp, which
  Closes: #636061

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/items/capacitor.cpp
18
18
 
19
19
********************************************************************
20
20
 
21
 
$Revision: 5143 $:
 
21
$Revision: 5308 $:
22
22
$Author: cohen@irascible.com $:
23
 
$Date: 2011-07-01 02:37:01 +0200 (Fri, 01 Jul 2011) $
 
23
$Date: 2011-07-30 21:09:56 +0200 (Sat, 30 Jul 2011) $
24
24
 
25
25
********************************************************************/
26
26
 
66
66
                
67
67
                        if (propertyDef->numeric) {
68
68
                                if (!current.isEmpty()) {
69
 
                                        qreal val = TextUtils::convertFromPowerPrefixU(current, propertyDef->symbol);
 
69
                                        double val = TextUtils::convertFromPowerPrefixU(current, propertyDef->symbol);
70
70
                                        if (!propertyDef->menuItems.contains(val)) {
71
71
                                                propertyDef->menuItems.append(val);
72
72
                                        }
73
73
                                }
74
 
                                foreach(qreal q, propertyDef->menuItems) {
 
74
                                foreach(double q, propertyDef->menuItems) {
75
75
                                        QString s = TextUtils::convertToPowerPrefix(q) + propertyDef->symbol;
76
76
                                        focusOutComboBox->addItem(s);
77
77
                                }
82
82
                                                propertyDef->sMenuItems.append(current);
83
83
                                        }
84
84
                                }
85
 
                                foreach(QString s, propertyDef->sMenuItems) {
86
 
                                        focusOutComboBox->addItem(s);
87
 
                                }
 
85
                                focusOutComboBox->addItems(propertyDef->sMenuItems);
88
86
                        }
89
87
                        if (!current.isEmpty()) {
90
88
                                int ix = focusOutComboBox->findText(current);
133
131
                if (m_comboBoxes.value(propertyDef) == focusOutComboBox) {
134
132
                        QString utext = text;
135
133
                        if (propertyDef->numeric) {
136
 
                                qreal val = TextUtils::convertFromPowerPrefixU(utext, propertyDef->symbol);
 
134
                                double val = TextUtils::convertFromPowerPrefixU(utext, propertyDef->symbol);
137
135
                                if (!propertyDef->menuItems.contains(val)) {
138
136
                                        // info view is redrawn, so combobox is recreated, so the new item is added to the combo box menu
139
137
                                        propertyDef->menuItems.append(val);