Skip to content

Commit

Permalink
Added in Set Speed for spindle
Browse files Browse the repository at this point in the history
  • Loading branch information
@joco-nz
joco-nz committed Sep 20, 2021
1 parent cda2e7d commit 6e15a88
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 9 deletions.
87 changes: 78 additions & 9 deletions bf20_mill/ui/mainwindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ RUN</string>
<string/>
</property>
<property name="page" stdset="0">
<number>9</number>
<number>10</number>
</property>
<attribute name="buttonGroup">
<string notr="true">btngrpLeftNav</string>
Expand All @@ -272,7 +272,7 @@ RUN</string>
<string/>
</property>
<property name="page" stdset="0">
<number>8</number>
<number>9</number>
</property>
<attribute name="buttonGroup">
<string notr="true">btngrpLeftNav</string>
Expand Down Expand Up @@ -7286,6 +7286,7 @@ Editor</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="feedswizard"/>
<widget class="QWidget" name="monitor_run">
<layout class="QGridLayout" name="gridLayout_33">
<item row="2" column="2">
Expand Down Expand Up @@ -8884,7 +8885,7 @@ CHANGED</string>
<item>
<widget class="VCPStackedWidget" name="stwRight">
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<property name="rules" stdset="0">
<string>[]</string>
Expand Down Expand Up @@ -9048,7 +9049,7 @@ SLOWER</string>
</property>
</widget>
</item>
<item row="2" column="2">
<item row="3" column="2">
<widget class="HalLabel" name="hallabel">
<property name="minimumSize">
<size>
Expand All @@ -9073,7 +9074,7 @@ SLOWER</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<widget class="QLabel" name="label_29">
<property name="text">
<string>Measured Spindle
Expand All @@ -9084,6 +9085,53 @@ Speed</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QSpinBox" name="setSpindleSpeed">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::UpDownArrows</enum>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>6000</number>
</property>
<property name="singleStep">
<number>100</number>
</property>
<property name="spindleRPM" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="MDIButton" name="mdibutton_27">
<property name="text">
<string>Set Speed</string>
</property>
<property name="MDICommand" stdset="0">
<string>S#&lt;setSpindleSpeed&gt;</string>
</property>
<property name="spindleBtn" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="HalButton" name="halbutton">
<property name="text">
Expand Down Expand Up @@ -9198,6 +9246,12 @@ Speed</string>
<property name="value">
<number>100</number>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
</property>
<property name="tickInterval">
<number>10</number>
</property>
<property name="actionName" stdset="0">
<string>machine.rapid-override.set</string>
</property>
Expand All @@ -9211,6 +9265,12 @@ Speed</string>
<property name="pageStep">
<number>5</number>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
</property>
<property name="tickInterval">
<number>10</number>
</property>
<property name="actionName" stdset="0">
<string>spindle.override</string>
</property>
Expand All @@ -9227,6 +9287,12 @@ Speed</string>
<property name="value">
<number>100</number>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
</property>
<property name="tickInterval">
<number>10</number>
</property>
<property name="actionName" stdset="0">
<string>machine.feed-override.set</string>
</property>
Expand Down Expand Up @@ -10690,6 +10756,9 @@ Z</string>
</property>
<item>
<widget class="FileSystemTable" name="filesystemtable">
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="hiddenColumns" stdset="0">
<string>1,2</string>
</property>
Expand Down Expand Up @@ -11993,12 +12062,12 @@ Override</string>
</property>
</designerdata>
<buttongroups>
<buttongroup name="btngrpRightNav"/>
<buttongroup name="btngrpMdi"/>
<buttongroup name="btngrpContInc"/>
<buttongroup name="btngrpG5x"/>
<buttongroup name="btngrpLeftNav"/>
<buttongroup name="btngrpIncrements"/>
<buttongroup name="btngrpMdi"/>
<buttongroup name="btngrpMode"/>
<buttongroup name="btngrpRightNav"/>
<buttongroup name="btngrpG5x"/>
<buttongroup name="btngrpContInc"/>
</buttongroups>
</ui>
17 changes: 17 additions & 0 deletions bf20_mill/ui/style.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,19 @@ QLineEdit, QLabel {
padding-right: 2px;
}

QSpinBox {
border-style: transparent;
border-color: rgb(134, 136, 138);
border-width: 2px;
border-radius: 5px;
color: black;
background: white;
selection-color: white;
selection-background-color: rgb(65, 84, 255);
font: 15pt "Bebas Kai";
padding-right: 2px;
}

QLineEdit:focus {
border-style: solid;
border-width: 3px;
Expand Down Expand Up @@ -417,6 +430,10 @@ QPushButton[spindleBtn] {
font: 16pt "Bebas Kai";
}

QSpinBox[spindleRPM] {
font: 20pt "Bebas Kai";
}

StatusLabel[spindleRPM] {
font: 20pt "Bebas Kai";
}
Expand Down

0 comments on commit 6e15a88

Please sign in to comment.