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

JASP configuration file feature + remote option #5062

Draft
wants to merge 38 commits into
base: stable
Choose a base branch
from
Draft

JASP configuration file feature + remote option #5062

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6c46eaf
Implements a data mode
JorisGoosen May 21, 2021
003123c
SKF JASP postmerge and fix
JorisGoosen Sep 21, 2021
aa63d26
latest version of jaspProcessControl and other submodules
JorisGoosen Dec 1, 2021
82f7f86
post qt6 merge fixes
JorisGoosen Mar 10, 2022
825d474
post rebase fixes 10-11-22
JorisGoosen Nov 10, 2022
8a49630
post rebase fix 7-12-22
JorisGoosen Dec 7, 2022
3d71dac
(event)=>{}
JorisGoosen Dec 7, 2022
7edb7cd
Rebasing mistake
boutinb Jan 27, 2023
6349af9
Make sure editing is quick and analyses are hidden in dataMode (#5040)
JorisGoosen Mar 1, 2023
191709f
dirty fix for the resize dialog (#5042)
RensDofferhoff Mar 1, 2023
55fea62
odule shenanigans
JorisGoosen Mar 16, 2023
aba724b
start
RensDofferhoff Apr 3, 2023
5f2fb73
progress
RensDofferhoff Apr 4, 2023
bef03ee
progress
RensDofferhoff Apr 5, 2023
a6a1bf2
progress
RensDofferhoff Apr 5, 2023
a44a893
progress
RensDofferhoff Apr 6, 2023
84807bc
progress
RensDofferhoff Apr 7, 2023
f286ea0
before overhaul
RensDofferhoff Apr 10, 2023
b0c3a38
functional
RensDofferhoff Apr 12, 2023
72b965f
giant oops
RensDofferhoff Apr 12, 2023
6945cab
v1
RensDofferhoff Apr 12, 2023
c94ee85
enabled sounds better
RensDofferhoff Apr 13, 2023
53c39e4
oops
RensDofferhoff Apr 15, 2023
b20d6ae
oops
RensDofferhoff Apr 15, 2023
d71aaa2
oops
RensDofferhoff Apr 16, 2023
c826d3d
constant access improvements
RensDofferhoff Apr 18, 2023
2d54356
add option locking
RensDofferhoff Apr 18, 2023
d56c6d3
oops
RensDofferhoff May 11, 2023
0dd5bbf
progress
RensDofferhoff May 12, 2023
3ed5704
factory
RensDofferhoff May 12, 2023
bb506d6
more extendable this way
RensDofferhoff May 15, 2023
8d58dd8
a small comment never hurts
RensDofferhoff May 15, 2023
f431a57
add toml
RensDofferhoff May 16, 2023
8a8df43
forgot the parser lib
RensDofferhoff May 16, 2023
a58c026
Documentation for analysis writers
RensDofferhoff May 17, 2023
8a232b9
Update jasp-qml-guide.md
RensDofferhoff May 22, 2023
c976461
dont change the submodule commits
RensDofferhoff May 22, 2023
311866d
added local conf browser
RensDofferhoff May 23, 2023
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
Next Next commit
post qt6 merge fixes
  • Loading branch information
@JorisGoosen
JorisGoosen committed May 16, 2023
commit 82f7f861a28a556587333ba3186076ae57c7fcce
2 changes: 0 additions & 2 deletions Desktop/components/JASP/Widgets/DataTableView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@

import QtQuick
import QtQuick.Controls
import JASP.Controls as JaspControls
import QtQml.Models
import QtGraphicalEffects


FocusScope
Expand Down
2 changes: 1 addition & 1 deletion Desktop/components/JASP/Widgets/PlotEditor/PlotEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Popup
onVisibleChanged: plotEditorModel.visible = visible
focus: true

Shortcut { onActivated: cancel(); sequence: StandardKey.Cancel; autoRepeat: false; enabled: visible }
Shortcut { onActivated: cancel(); sequences: [StandardKey.Cancel]; autoRepeat: false; enabled: visible }

function cancel()
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop/components/JASP/Widgets/RenameColumnDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Popup
Connections
{
target: dataSetModel
onRenameColumnDialog:
function onRenameColumnDialog(columnIndex)
{
console.log("renaming column dialog opened for " + String(columnIndex))
colIndex = columnIndex;
Expand Down
4 changes: 2 additions & 2 deletions Desktop/components/JASP/Widgets/ResizeDataDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Popup

Connections
{
target: ribbonModel
onResizeData: popupResizeData.open()
target: ribbonModel
function onResizeData() { popupResizeData.open() }
}

Loader
Expand Down
3 changes: 2 additions & 1 deletion Desktop/components/JASP/Widgets/Ribbon/Ribbons.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ Item
Connections
{
target: ribbonModel
onDataModeChanged: focusOut();

function onDataModeChanged() { focusOut(); }
}

function setCurrentIndex(which, _index=null)
Expand Down
2 changes: 1 addition & 1 deletion Desktop/components/JASP/Widgets/VariablesWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ FocusScope
{
id: columnNameVariablesWindow
text: labelModel.columnName
onTextChanged: labelModel.columnName = text
onTextChanged: if(labelModel.columnName != text) labelModel.columnName = text
color: jaspTheme.textEnabled
font: jaspTheme.fontGroupTitle
enabled: ribbonModel.dataMode
Expand Down
3 changes: 2 additions & 1 deletion Desktop/data/datasetpackage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,9 @@ QModelIndex DataSetPackage::index(int row, int column, const QModelIndex &parent
Log::log() << "Got a valid parent in DataSetPackage::index but it isn't one of the `*Root`s" << std::endl;
break;
}

}

return createIndex(row, column, pointer);
}

const DataSetPackage::intnlPntPair * DataSetPackage::getInternalPointerPairFromIndex(const QModelIndex & index) const
Expand Down
14 changes: 7 additions & 7 deletions Desktop/qquick/datasetview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ void DataSetView::buildNewLinesAndCreateNewItems()
if(_currentViewportColMax == -1 || _currentViewportColMin == -1 || _currentViewportRowMax == -1 || _currentViewportRowMin == -1)
return;

#ifdef DATASETVIEW_ADD_LINES_PLEASE
#ifdef ADD_LINES_PLEASE
_linesActualSize = 0;
size_t expectedLinesSize = (_currentViewportColMax - _currentViewportColMin) * (_currentViewportRowMax - _currentViewportRowMin) * 4 * 2;
if(_lines.size() < expectedLinesSize)
Expand Down Expand Up @@ -446,7 +446,7 @@ void DataSetView::buildNewLinesAndCreateNewItems()
#endif


#ifdef DATASETVIEW_ADD_LINES_PLEASE
#ifdef ADD_LINES_PLEASE
if(up) addLine(pos1x, pos0y, pos0x, pos0y);
if(down) addLine(pos0x, pos1y, pos1x, pos1y);

Expand All @@ -467,7 +467,7 @@ void DataSetView::buildNewLinesAndCreateNewItems()

JASPTIMER_STOP(buildNewLinesAndCreateNewItems_GRID);

#ifdef DATASETVIEW_ADD_LINES_PLEASE
#ifdef ADD_LINES_PLEASE
addLine(_viewportX + 0.5f, _viewportY, _viewportX + 0.5f, _viewportY + _viewportH);
addLine(_viewportX + _rowNumberMaxWidth, _viewportY, _viewportX + _rowNumberMaxWidth, _viewportY + _viewportH);

Expand All @@ -486,7 +486,7 @@ void DataSetView::buildNewLinesAndCreateNewItems()
if(createRowNumber(row))
{

#ifdef DATASETVIEW_ADD_LINES_PLEASE
#ifdef ADD_LINES_PLEASE
float pos0x(_viewportX),
pos0y((1 + row) * _dataRowsMaxHeight),
pos1x(_viewportX + _rowNumberMaxWidth),
Expand All @@ -507,7 +507,7 @@ void DataSetView::buildNewLinesAndCreateNewItems()

createColumnHeader(col);

#ifdef DATASETVIEW_ADD_LINES_PLEASE
#ifdef ADD_LINES_PLEASE
float pos0x(_colXPositions[col]),
pos0y(_viewportY),
pos1x(pos0x + _dataColsMaxWidth[col]),
Expand All @@ -522,7 +522,7 @@ void DataSetView::buildNewLinesAndCreateNewItems()
#endif
}

#ifdef DATASETVIEW_ADD_LINES_PLEASE
#ifdef ADD_LINES_PLEASE
_linesWasChanged = true;
#endif

Expand Down Expand Up @@ -1531,7 +1531,7 @@ void DataSetView::myParentChanged(QQuickItem * newParentItem)
*/
}

#ifdef DATASETVIEW_ADD_LINES_PLEASE
#ifdef ADD_LINES_PLEASE
QSGNode * DataSetView::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
{
//JASPTIMER_RESUME(updatePaintNode);
Expand Down
6 changes: 3 additions & 3 deletions Desktop/qquick/datasetview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

//#define DATASETVIEW_DEBUG_VIEWPORT
//#define DATASETVIEW_DEBUG_CREATION
#define DATASETVIEW_SHOW_ITEMS_PLEASE
#define DATASETVIEW_ADD_LINES_PLEASE
#define SHOW_ITEMS_PLEASE
#define ADD_LINES_PLEASE

struct ItemContextualized
{
Expand Down Expand Up @@ -210,7 +210,7 @@ public slots:
void storeOutOfViewItems();
void buildNewLinesAndCreateNewItems();

#ifdef DATASETVIEW_ADD_LINES_PLEASE
#ifdef ADD_LINES_PLEASE
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override;
#endif
float extraColumnWidth() { return !_extraColumnItem ? 0 : 2 + _extraColumnItem->width(); }
Expand Down