Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding levels #5789

Open
wants to merge 22 commits into
base: development
Choose a base branch
from
Open

Adding levels #5789

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e9cb4dd
Adding levels
JorisGoosen Jan 23, 2025
a6aaeec
support either dropping levels or not, also based on if anything is f…
JorisGoosen Feb 11, 2025
dd5b76a
added a button for turning drop levels on and off
JorisGoosen Feb 11, 2025
d67a2f1
interaction with computed columns seems ok now
JorisGoosen Feb 11, 2025
40184e3
finishing touches
JorisGoosen Feb 11, 2025
b7ee6e2
little bit prettier
JorisGoosen Feb 11, 2025
86a23d9
use dropLevels in checking levels
JorisGoosen Feb 13, 2025
143a44d
Add keep/drop levels to filterconstructor and add something in the help
JorisGoosen Feb 13, 2025
24d1565
comment dataChanged call away cause it crashes my debug on windows an…
JorisGoosen Feb 13, 2025
dbb70eb
droplevels now does always drop levels
JorisGoosen Feb 17, 2025
6d0d02f
use ⌫ as icon and rename the "erase" col to "remove"
JorisGoosen Feb 17, 2025
b3f9158
remove unused stuff from sql and code
JorisGoosen Feb 17, 2025
28f6d06
add computeFilter to Columns db table
JorisGoosen Feb 17, 2025
8a3efb6
add computeFilter meat and make new level entry a bit tighter
JorisGoosen Feb 17, 2025
05a5901
allow for dropdown of filters in a column to work
JorisGoosen Feb 18, 2025
e419761
make sure the computed columns now use tthe filter if its enabled
JorisGoosen Feb 18, 2025
c1ccbd4
move dropLevels to Column from Filter
JorisGoosen Feb 25, 2025
4aa5512
button added and works, reused the eye icon
JorisGoosen Feb 25, 2025
2e0dadf
add level on enter and try to fix the weird issue with the filterallo…
JorisGoosen Feb 25, 2025
686439e
make all filterallows work and tweak sizing of filterwindow and varsw…
JorisGoosen Feb 26, 2025
1e4a8eb
add noChoice -> drop/keep behaviour
JorisGoosen Feb 26, 2025
3d3556d
Fix https://github.com/jasp-stats/INTERNAL-jasp/issues/2700 because i…
JorisGoosen Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix jasp-stats/INTERNAL-jasp#2700 because im already doing something … 
…with those buttons

Also makes tooltips on disabled Rectangular/RoundedButtons show
  • Loading branch information
@JorisGoosen
JorisGoosen committed Feb 26, 2025
commit 3d3556d0199d27564b3eead84bd2bcdeb14cdd14
15 changes: 6 additions & 9 deletions Desktop/components/JASP/Widgets/LabelEditorWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,41 +665,38 @@ FocusScope
iconSource: jaspTheme.iconPath + "arrow-reverse.png"
onClicked: { forceActiveFocus(); columnModel.reverse(); }

toolTip: qsTr("Reverse order of all labels")
toolTip: !columnModel.autoSort ? qsTr("Reverse order of all labels") : qsTr("Turn automatically ordering off to reverse order of all labels")

height: buttonColumnVariablesWindow.buttonHeight
implicitHeight: buttonColumnVariablesWindow.buttonHeight
width: height
visible: !columnModel.autoSort
enabled: columnModel.rowsTotal > 1
enabled: !columnModel.autoSort && columnModel.rowsTotal > 1
}

RoundedButton
{
iconSource: jaspTheme.iconPath + "arrow-up.png"

onClicked: { forceActiveFocus(); columnModel.moveSelectionUp(); levelsTableView.selectedRow--; }
toolTip: qsTr("Move selected labels up")
toolTip: !columnModel.autoSort ? qsTr("Move selected labels up") : qsTr("Turn automatically ordering off to move labels up manually")

height: buttonColumnVariablesWindow.buttonHeight
implicitHeight: buttonColumnVariablesWindow.buttonHeight
width: height
enabled: levelsTableView.selectedRow > 0
visible: !columnModel.autoSort
enabled: !columnModel.autoSort && levelsTableView.selectedRow > 0
}

RoundedButton
{
iconSource: jaspTheme.iconPath + "arrow-down.png"

onClicked: { forceActiveFocus(); columnModel.moveSelectionDown(); levelsTableView.selectedRow++; }
toolTip: qsTr("Move selected labels down")
toolTip: !columnModel.autoSort ? qsTr("Move selected labels down") : qsTr("Turn automatically ordering off to move labels down manually")

height: buttonColumnVariablesWindow.buttonHeight
implicitHeight: buttonColumnVariablesWindow.buttonHeight
width: height
enabled: levelsTableView.selectedRow >= 0 && levelsTableView.selectedRow < columnModel.rowCount() - 1
visible: !columnModel.autoSort
enabled: !columnModel.autoSort && levelsTableView.selectedRow >= 0 && levelsTableView.selectedRow < columnModel.rowCount() - 1
}

RoundedButton
Expand Down
1 change: 1 addition & 0 deletions Desktop/data/columnmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public slots:
void setRowWidth(double len);
void onChosenColumnChanged();
void refresh();
void refreshUnselect();
void checkRemovedColumns(int columnIndex, int count);
void checkInsertedColumns(const QModelIndex & parent, int first, int last);
void openComputedColumn(const QString & name);
Expand Down
8 changes: 4 additions & 4 deletions QMLComponents/components/JASP/Controls/RectangularButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ Rectangle
: _pressed ? jaspTheme.buttonColorPressed
: (filterButtonRoot.hovered || filterButtonRoot.activeFocus) ? jaspTheme.buttonColorHovered
: jaspTheme.buttonColor
border.color: (filterButtonRoot.hovered || selected) ? jaspTheme.buttonBorderColorHovered
: jaspTheme.buttonBorderColor
border.color: enabled && (filterButtonRoot.hovered || selected) ? jaspTheme.buttonBorderColorHovered
: jaspTheme.buttonBorderColor
border.width: 1


Expand All @@ -82,9 +82,9 @@ Rectangle
anchors.fill: parent
acceptedButtons: Qt.LeftButton
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
cursorShape: filterButtonRoot.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
onClicked: filterButtonRoot.clicked();
visible: filterButtonRoot.enabled
//visible: filterButtonRoot.enabled
//propagateComposedEvents: true
}

Expand Down
Loading