Drop image instruction

hrobeers · Mar 26, 2014 · 51798eb · 51798eb
1 parent a45befc
commit 51798eb
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/src/foileditors/outlineeditor/outlineeditor.cpp b/src/foileditors/outlineeditor/outlineeditor.cpp
@@ -41,10 +41,11 @@ OutlineEditor::OutlineEditor(Foil *foil, QWidget *parent) :
     //
     // PathEditors
     //
+    QFlags<Features::e> features(Features::HorizontalAxis | Features::DropImageHereText);
     _topPathEditor = new patheditor::PathEditorWidget();
-    _topPathEditor->enableFeatures(Features::HorizontalAxis);
+    _topPathEditor->enableFeatures(features);
     _botPathEditor = new patheditor::PathEditorWidget();
-    _botPathEditor->enableFeatures(Features::HorizontalAxis);
+    _botPathEditor->enableFeatures(features);
 
 
     //

diff --git a/src/foileditors/profileeditor/profileeditor.cpp b/src/foileditors/profileeditor/profileeditor.cpp
@@ -37,7 +37,7 @@ ProfileEditor::ProfileEditor(Foil* foil, QWidget *parent) :
     QWidget(parent)
 {
     _pathEditor = new patheditor::PathEditorWidget();
-    _pathEditor->enableFeatures(Features::HorizontalAxis);
+    _pathEditor->enableFeatures(QFlags<Features::e>(Features::HorizontalAxis | Features::DropImageHereText));
 
     QComboBox* symmetryCombo = new QComboBox();
     symmetryCombo->addItem(tr("Symmetric"));

diff --git a/src/foileditors/thicknesseditor/thicknesseditor.cpp b/src/foileditors/thicknesseditor/thicknesseditor.cpp
@@ -36,8 +36,8 @@ ThicknessEditor::ThicknessEditor(Foil *foil, QWidget *parent) :
     QWidget(parent)
 {
     _pathEditor = new patheditor::PathEditorWidget();
-    _pathEditor->enableFeatures(Features::HorizontalAxis);
-    _pathEditor->enableFeatures(Features::VerticalAxis);
+    _pathEditor->enableFeatures(QFlags<Features::e>(Features::HorizontalAxis | Features::VerticalAxis |
+                                                    Features::DropImageHereText));
 
     QGroupBox* gb = new QGroupBox(tr("Thickness"));
     QVBoxLayout* gbLayout = new QVBoxLayout();

diff --git a/src/patheditor/patheditorwidget.cpp b/src/patheditor/patheditorwidget.cpp
@@ -88,24 +88,31 @@ void PathEditorWidget::clear()
 
 void PathEditorWidget::enableFeatures(QFlags<Features::e> features)
 {
-    if (Features::HorizontalAxis == (Features::HorizontalAxis & features) &&
-        Features::HorizontalAxis != (Features::HorizontalAxis & _enabledFeatures))
+    if (features.testFlag(Features::HorizontalAxis) && !_enabledFeatures.testFlag(Features::HorizontalAxis))
     {
         _horizontalAxis = new QGraphicsLineItem(this->scene()->sceneRect().left(), 0,
                                                 this->scene()->sceneRect().right(), 0);
         this->scene()->addItem(_horizontalAxis);
 
-        _enabledFeatures = _enabledFeatures | Features::HorizontalAxis;
+        _enabledFeatures |= Features::HorizontalAxis;
     }
 
-    if (Features::VerticalAxis == (Features::VerticalAxis & features) &&
-        Features::VerticalAxis != (Features::VerticalAxis & _enabledFeatures))
+    if (features.testFlag(Features::VerticalAxis) && !_enabledFeatures.testFlag(Features::VerticalAxis))
     {
         _verticalAxis = new QGraphicsLineItem(0, this->scene()->sceneRect().bottom(),
                                               0, this->scene()->sceneRect().top());
         this->scene()->addItem(_verticalAxis);
 
-        _enabledFeatures = _enabledFeatures | Features::HorizontalAxis;
+        _enabledFeatures |= Features::VerticalAxis;
+    }
+
+    if (features.testFlag(Features::DropImageHereText) && !_enabledFeatures.testFlag(Features::DropImageHereText))
+    {
+        QFont font;
+        font.setWeight(QFont::Light);
+        this->scene()->addText(tr("Drop Image Here"), font);
+
+        _enabledFeatures |= Features::DropImageHereText;
     }
 }
 

diff --git a/src/patheditor/patheditorwidget.h b/src/patheditor/patheditorwidget.h
@@ -39,7 +39,8 @@ namespace patheditor
         {
             None = 0x0,
             HorizontalAxis = 0x1,
-            VerticalAxis = 0x2
+            VerticalAxis = 0x2,
+            DropImageHereText = 0x4
         };
     };
 

diff --git a/src/version_autogen.h b/src/version_autogen.h
@@ -5,7 +5,7 @@
 #ifndef VERSION_AUTOGEN_H
 #define VERSION_AUTOGEN_H
 
-#define BUILD_NUMBER 352
-#define COMMIT_HASH "77a55005650e2aa78cd80c0b4c3e1b76d2220f37"
+#define BUILD_NUMBER 353
+#define COMMIT_HASH "a45befc3866d18dbca7290023983495fdd65f5a9"
 
 #endif // VERSION_AUTOGEN_H