← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/partseditor/partseditorpaletteitem.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/partseditor/partseditorpaletteitem.cpp
18
18
 
19
19
********************************************************************
20
20
 
21
 
$Revision: 5143 $:
 
21
$Revision: 5302 $:
22
22
$Author: cohen@irascible.com $:
23
 
$Date: 2011-07-01 02:37:01 +0200 (Fri, 01 Jul 2011) $
 
23
$Date: 2011-07-30 00:14:56 +0200 (Sat, 30 Jul 2011) $
24
24
 
25
25
********************************************************************/
26
26
 
200
200
        Q_UNUSED(connector);
201
201
}
202
202
 
203
 
bool PartsEditorPaletteItem::setUpImage(ModelPart * modelPart, ViewIdentifierClass::ViewIdentifier viewIdentifier, const LayerHash & viewLayers, ViewLayer::ViewLayerID viewLayerID, ViewLayer::ViewLayerSpec viewLayerSpec, bool doConnectors, QString & error)
 
203
bool PartsEditorPaletteItem::setUpImage(ModelPart * modelPart, ViewIdentifierClass::ViewIdentifier viewIdentifier, const LayerHash & viewLayers, ViewLayer::ViewLayerID viewLayerID, ViewLayer::ViewLayerSpec viewLayerSpec, bool doConnectors, LayerAttributes & layerAttributes, QString & error)
204
204
{
205
205
        Q_UNUSED(viewLayerSpec);
206
206
        Q_UNUSED(error);
213
213
 
214
214
        if (m_svgStrings == NULL) {
215
215
                // TODO Mariano: Copied from paletteitembase::setUpImage (extract what's in common)
216
 
                LayerAttributes layerAttributes;
217
216
                if (modelPartShared->domDocument() ) {
218
217
                        bool result = layerAttributes.getSvgElementID(modelPartShared->domDocument(), viewIdentifier, viewLayerID);
219
218
                        if (!result) return false;
251
250
                renderer = FSvgRenderer::getByFilename(fn, viewLayerID);
252
251
                if (renderer == NULL) {
253
252
                        renderer = new FSvgRenderer();
254
 
                        bool loaded = false;
 
253
                        QByteArray loaded;
255
254
                        if (!m_itemSVG.isEmpty()) {
256
255
                                loaded = renderer->loadSvg(m_itemSVG.toUtf8(), m_svgStrings->absolutePath());
257
256
                        }
258
 
                        if (!loaded) {
 
257
                        if (loaded.isEmpty()) {
259
258
                                loaded = renderer->loadSvg(m_svgStrings->absolutePath());
260
259
                        }
261
 
                        if (!loaded) {
 
260
                        if (loaded.isEmpty()) {
262
261
                                QMessageBox::information( NULL, QObject::tr("Fritzing"),
263
262
                                                QObject::tr("The file %1 is not a Fritzing file (7).").arg(m_svgStrings->absolutePath()));
264
263
                                delete renderer;
328
327
 
329
328
void PartsEditorPaletteItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) {
330
329
        setCursor(QCursor(Qt::ArrowCursor));
331
 
        GraphicsSvgLineItem::hoverEnterEvent(event);
 
330
        QGraphicsSvgItem::hoverEnterEvent(event);
332
331
}
333
332
 
334
333
void PartsEditorPaletteItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) {
335
 
        GraphicsSvgLineItem::hoverLeaveEvent(event);
 
334
        QGraphicsSvgItem::hoverLeaveEvent(event);
336
335
}
337
336
 
338
337
void PartsEditorPaletteItem::setItemSVG(const QString & itemSVG) {