post rebase fix 7-12-22

resize the resize data dialog a bit made sure emptyvalue labels are not put in the editItem
jasp-stats · RensDofferhoff · May 21, 2021 · Sep 21, 2021 · Dec 1, 2021 · Mar 10, 2022
commit 8a496305af726bc92ec360074d165afe29112af2
diff --git a/CommonData/columnutils.h b/CommonData/columnutils.h
@@ -3,7 +3,8 @@
 
 #include <string>
 #include <vector>
-
+#include <set>
+#include <map>
 
 class ColumnUtils
 {

diff --git a/Desktop/components/JASP/Widgets/ResizeDataDialog.qml b/Desktop/components/JASP/Widgets/ResizeDataDialog.qml
@@ -39,8 +39,8 @@ Popup
 
 		Item
 		{
-			height:	resizeButton.y + resizeButton.height + jaspTheme.generalAnchorMargin
-			width:	inputs.width
+			height:	inputs.height + jaspTheme.generalAnchorMargin + (40 * jaspTheme.uiScale)
+			width:	250 * jaspTheme.uiScale
 
 			Component.onCompleted:	cols.forceActiveFocus();
 
@@ -62,8 +62,7 @@ Popup
 			Item
 			{
 				id:				inputs
-				width:			200 * jaspTheme.uiScale
-				height:			cols.y + cols.height + jaspTheme.generalAnchorMargin
+				height:			100 * jaspTheme.uiScale + 2 * jaspTheme.generalAnchorMargin
 
 				anchors
 				{
@@ -79,9 +78,8 @@ Popup
 					text:			qsTr("Columns")
 					anchors
 					{
-						top:		inputs.top
-						left:		cols.left
-						right:		cols.right
+						top:				inputs.top
+						horizontalCenter:	cols.horizontalCenter
 					}
 				}
 
@@ -91,9 +89,8 @@ Popup
 					text:			qsTr("Rows")
 					anchors
 					{
-						top:		inputs.top
-						left:		rows.left
-						right:		rows.right
+						top:				inputs.top
+						horizontalCenter:	rows.horizontalCenter
 					}
 				}
 
@@ -103,7 +100,12 @@ Popup
 					text:					"X"
 					horizontalAlignment:	Text.AlignHCenter
 					verticalAlignment:		Text.AlignVCenter
-					anchors.centerIn:		parent
+					anchors
+					{
+						top:				colsLabel.bottom
+						horizontalCenter:	parent.horizontalCenter
+						topMargin:			jaspTheme.generalAnchorMargin
+					}
 				}
 
 				IntegerField
@@ -113,13 +115,13 @@ Popup
 					fieldWidth:				width
 					anchors
 					{
-						top:				x.verticalCenter
+						top:				x.bottom
 						left:				parent.left
 						right:				x.left
 						margins:			jaspTheme.generalAnchorMargin
 					}
 
-					//KeyNavigation.tab:		rows
+					KeyNavigation.tab:		rows
 					KeyNavigation.right:	rows
 					KeyNavigation.down:		resizeButton
 				}
@@ -131,14 +133,13 @@ Popup
 					fieldWidth:				width
 					anchors
 					{
-						top:				x.verticalCenter
+						top:				x.bottom
 						left:				x.right
 						right:				parent.right
 						margins:			jaspTheme.generalAnchorMargin
 					}
-					KeyNavigation.down:		resizeButton
-					KeyNavigation.right:	resizeButton
-					//KeyNavigation.tab:		resizeButton
+					KeyNavigation.down:		closeButtonCross
+					KeyNavigation.tab:		resizeButton
 				}
 			}
 
@@ -149,15 +150,12 @@ Popup
 				text:					qsTr("Resize")
 				onClicked:				{ dataSetModel.resizeData(rows.value, cols.value); popupResizeData.close(); }
 				toolTip:				qsTr("Resize data to set values")
-				KeyNavigation.right:	closeButtonCross
-				//KeyNavigation.tab:		closeButtonCross
-				//KeyNavigation.backtab:	rows
-				KeyNavigation.left:		rows
-				KeyNavigation.up:		cols
+
+				KeyNavigation.tab:		closeButtonCross
 
 				anchors
 				{
-					top:				inputs.bottom
+					bottom:				inputs.bottom
 					margins:			jaspTheme.generalAnchorMargin
 					left:				parent.left
 					right:				closeButtonCross.left
@@ -173,11 +171,12 @@ Popup
 				height:					resizeButton.height
 				onClicked:				popupResizeData.close()
 				toolTip:				qsTr("Close without resizing data")
-				KeyNavigation.up:		rows
+				KeyNavigation.tab:		cols
+
 				anchors
 				{
 					right:				parent.right
-					top:				inputs.bottom
+					bottom:				inputs.bottom
 					margins:			jaspTheme.generalAnchorMargin
 				}
 			}

diff --git a/Desktop/data/datasetpackage.cpp b/Desktop/data/datasetpackage.cpp
@@ -26,6 +26,7 @@
 #include "timers.h"
 #include "utilities/appdirs.h"
 #include "utils.h"
+#include "columnutils.h"
 #include "utilities/messageforwarder.h"
 #include "datasetpackagesubnodemodel.h"
 #include "databaseconnectioninfo.h"
@@ -1128,13 +1129,13 @@ void DataSetPackage::initColumnWithStrings(QVariant colId, std::string newName,
 	bool	useCustomThreshold	= Settings::value(Settings::USE_CUSTOM_THRESHOLD_SCALE).toBool();
 	size_t	thresholdScale		= (useCustomThreshold ? Settings::value(Settings::THRESHOLD_SCALE) : Settings::defaultValue(Settings::THRESHOLD_SCALE)).toUInt();
 
-	bool valuesAreIntegers		= Utils::convertVecToInt(values, intValues, uniqueValues, emptyValuesMap);
+	bool valuesAreIntegers		= ColumnUtils::convertVecToInt(values, intValues, uniqueValues, emptyValuesMap);
 
 	size_t minIntForThresh		= thresholdScale > 2 ? 2 : 0;
 
 	auto isNominalInt			= [&](){ return valuesAreIntegers && uniqueValues.size() == minIntForThresh; };
 	auto isOrdinal				= [&](){ return valuesAreIntegers && uniqueValues.size() >  minIntForThresh && uniqueValues.size() <= thresholdScale; };
-	auto isScalar				= [&](){ return Utils::convertVecToDouble(values, doubleValues, emptyValuesMap); };
+	auto isScalar				= [&](){ return ColumnUtils::convertVecToDouble(values, doubleValues, emptyValuesMap); };
 
 	if		(isOrdinal())					initColumnAsNominalOrOrdinal(	colId,	newName,	intValues,		true	);
 	else if	(isNominalInt())				initColumnAsNominalOrOrdinal(	colId,	newName,	intValues,		false	);

diff --git a/Desktop/qquick/datasetview.cpp b/Desktop/qquick/datasetview.cpp
@@ -14,6 +14,7 @@
 #include <QGuiApplication>
 #include <QClipboard>
 #include "utils.h"
+#include "columnutils.h"
 #include "utilities/languagemodel.h"
 #include "data/datasettablemodel.h"
 
@@ -938,7 +939,7 @@ void DataSetView::positionEditItem(int row, int col)
 
 	if(!_editItemContextual)
 	{
-		_editItemContextual = new ItemContextualized(setStyleDataItem(nullptr, active, col, row));
+		_editItemContextual = new ItemContextualized(setStyleDataItem(nullptr, active, col, row, false));
 
 		//forceActiveFocus();
 
@@ -960,7 +961,7 @@ void DataSetView::positionEditItem(int row, int col)
 	else
 	{
 		//Log::log() << "repositioning current edit item (row=" << row << ", col=" << col << ")" << std::endl;
-		setStyleDataItem(_editItemContextual->context, active, col, row);
+		setStyleDataItem(_editItemContextual->context, active, col, row, false);
 	}
 
 	setTextItemInfo(row, col, _editItemContextual->item); //Will set it visible
@@ -1322,7 +1323,7 @@ void DataSetView::contextMenuClickedAtIndex(QModelIndex index)
 		_selectionModel->select(index, QItemSelectionModel::SelectCurrent);
 }
 
-QQmlContext * DataSetView::setStyleDataItem(QQmlContext * previousContext, bool active, size_t col, size_t row)
+QQmlContext * DataSetView::setStyleDataItem(QQmlContext * previousContext, bool active, size_t col, size_t row, bool emptyValLabel)
 {
 	QModelIndex idx = _model->index(row, col);
 
@@ -1333,6 +1334,9 @@ QQmlContext * DataSetView::setStyleDataItem(QQmlContext * previousContext, bool
 
 	QString text = _storedDisplayText[row][col];
 
+	if(text == tq(ColumnUtils::emptyValue) && !emptyValLabel)
+		text = "";
+
 	if(previousContext == nullptr)
 		previousContext = new QQmlContext(qmlContext(this), this);
 
@@ -1572,6 +1576,7 @@ QSGNode * DataSetView::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 			currentNode->setFlag(QSGNode::OwnsMaterial, false);
 			currentNode->setFlag(QSGNode::OwnsGeometry, true);
 			currentNode->setMaterial(&_material);
+			currentNode->setRenderOrder(100);
 
 			justAdded = true;
 

diff --git a/Desktop/qquick/datasetview.h b/Desktop/qquick/datasetview.h
@@ -230,7 +230,7 @@ public slots:
 	void			updateExtraColumnItem();
 	void			positionEditItem(	int row, int col);
 
-	QQmlContext *	setStyleDataItem(			QQmlContext * previousContext, bool active, size_t col, size_t row);
+	QQmlContext *	setStyleDataItem(			QQmlContext * previousContext, bool active, size_t col, size_t row, bool emptyValLabel = true);
 	QQmlContext *	setStyleDataRowNumber(		QQmlContext * previousContext, QString text, int row);
 	QQmlContext *	setStyleDataColumnHeader(	QQmlContext * previousContext, QString text, int column, bool isComputed, bool isInvalidated, bool isFiltered,  QString computedError, int columnType);
 

diff --git a/QMLComponents/CMakeLists.txt b/QMLComponents/CMakeLists.txt
@@ -20,12 +20,14 @@ target_include_directories(
   QMLComponents
   PUBLIC # JASP
   ${PROJECT_SOURCE_DIR}/Common
+  ${PROJECT_SOURCE_DIR}/CommonData
 )
 
 target_link_libraries(
   QMLComponents
   PUBLIC
          Common
+		 CommonData
          Qt::Core
          Qt::Gui
          Qt::Widgets

diff --git a/QMLComponents/controls/textinputbase.cpp b/QMLComponents/controls/textinputbase.cpp
@@ -19,6 +19,7 @@
 #include "textinputbase.h"
 #include "analysisform.h"
 #include "utils.h"
+#include "columnutils.h"
 
 using namespace std;