Handle backspace when typing in numbers

NREL · Jan 30, 2015 · 1666408 · 1666408 · nrel-bot · Jan 30, 2015
1 parent f451ab1
commit 1666408
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/openstudiocore/src/openstudio_lib/ScheduleDayView.cpp b/openstudiocore/src/openstudio_lib/ScheduleDayView.cpp
@@ -1624,7 +1624,7 @@ void DaySchedulePlotArea::mouseMoveEvent(QMouseEvent * event)
 
       m_keyboardInputText->setPlainText("Enter Value");
       double textX = m_currentHoverItem->hCenterPos() - 2 * LINEWIDTH;
-      double textY = m_currentHoverItem->vCenterPos() - 2 * LINEWIDTH;
+      double textY = m_currentHoverItem->vCenterPos() - 1.5 * LINEWIDTH;
       m_keyboardInputText->setPos(textX, textY);
 
       setFocus();
@@ -1749,7 +1749,7 @@ void DaySchedulePlotArea::mouseMoveEvent(QMouseEvent * event)
 
       m_keyboardInputText->setPlainText("Enter Value");
       double textX = m_currentHoverItem->hCenterPos() - 2 * LINEWIDTH;
-      double textY = m_currentHoverItem->vCenterPos() - 2 * LINEWIDTH;
+      double textY = m_currentHoverItem->vCenterPos() - 1.5 * LINEWIDTH;
       m_keyboardInputText->setPos(textX, textY);
 
       setFocus();
@@ -1856,7 +1856,16 @@ void DaySchedulePlotArea::keyPressEvent(QKeyEvent * event)
       m_keyboardInputValue.append(event->text());
       m_keyboardInputText->setPlainText("-");
       double textX = m_currentHoverItem->hCenterPos() - 2 * LINEWIDTH;
-      double textY = m_currentHoverItem->vCenterPos() - 2 * LINEWIDTH;
+      double textY = m_currentHoverItem->vCenterPos() - 1.5 * LINEWIDTH;
+      m_keyboardInputText->setPos(textX, textY);
+    }
+    else if (event->key() == Qt::Key_Backspace)
+    {
+      m_keyboardInputValue.chop(1);
+
+      m_keyboardInputText->setPlainText(m_keyboardInputValue);
+      double textX = m_currentHoverItem->hCenterPos() - 2 * LINEWIDTH;
+      double textY = m_currentHoverItem->vCenterPos() - 1.5* LINEWIDTH;
       m_keyboardInputText->setPos(textX, textY);
     }
     else if( event->key() == Qt::Key_0 || 
@@ -1875,7 +1884,7 @@ void DaySchedulePlotArea::keyPressEvent(QKeyEvent * event)
       m_keyboardInputValue.append(event->text());
       m_keyboardInputText->setPlainText(m_keyboardInputValue);
       double textX = m_currentHoverItem->hCenterPos() - 2 * LINEWIDTH;
-      double textY = m_currentHoverItem->vCenterPos() - 2 * LINEWIDTH;
+      double textY = m_currentHoverItem->vCenterPos() - 1.5 * LINEWIDTH;
       m_keyboardInputText->setPos(textX, textY);
     }
   }

diff --git a/openstudiocore/src/openstudio_lib/SchedulesView.cpp b/openstudiocore/src/openstudio_lib/SchedulesView.cpp
@@ -1623,6 +1623,13 @@ ScheduleRuleView::ScheduleRuleView(bool isIP,
 
   nameHLayout->addWidget(colorWidget);
 
+  QString priorityString("Priority ");
+  priorityString.append(QString::number(m_scheduleRule.ruleIndex() + 1));
+  QLabel * priorityLabel = new QLabel(priorityString);
+  nameHLayout->addWidget(priorityLabel);
+
+  nameHLayout->addSpacing(10);
+
   m_nameEditField = new OSLineEdit();
   m_nameEditField->bind(m_scheduleRule,"name");
   nameHLayout->addWidget(m_nameEditField);