From add0ad4c39ced92379c0d8e0f6545dd6639284aa Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 23 Mar 2024 22:51:09 +0100 Subject: [PATCH 1/2] Issue-1356: Reversed row/column order for arrays --- src/edt/edt/EditorOptionsInst.ui | 310 +++++++++++------------ src/edt/edt/InstPropertiesPage.ui | 346 +++++++++++++------------- src/edt/edt/MakeArrayOptionsDialog.ui | 276 ++++++++++---------- 3 files changed, 462 insertions(+), 470 deletions(-) diff --git a/src/edt/edt/EditorOptionsInst.ui b/src/edt/edt/EditorOptionsInst.ui index 5d5c8a5aa..63e963d20 100644 --- a/src/edt/edt/EditorOptionsInst.ui +++ b/src/edt/edt/EditorOptionsInst.ui @@ -6,7 +6,7 @@ 0 0 - 358 + 416 496 @@ -51,8 +51,8 @@ 0 0 - 358 - 496 + 402 + 506 @@ -71,6 +71,29 @@ 2 + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 4 + + + + + + + + Place origin of cell + + + @@ -198,13 +221,6 @@ - - - - Place origin of cell - - - @@ -297,7 +313,20 @@ - + + + + Qt::Vertical + + + + 20 + 120 + + + + + @@ -330,44 +359,7 @@ 2 - - - - Column step - - - - - - - - 1 - 0 - - - - - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 1 - 0 - - - - - + y = @@ -377,37 +369,7 @@ - - - - - 1 - 0 - - - - - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 1 - 0 - - - - - + x = @@ -417,31 +379,51 @@ - - - - Row step + + + + + 1 + 0 + - - + + - Dimension - - - - - - - columns = + y = Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + + + + Row vector + + + + + + + Column vector + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + @@ -451,33 +433,7 @@ - - - - rows = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 1 - 0 - - - - - 0 - 0 - - - - - + Warning: although row and column vectors can be arbitrary combination, some design systems only accept orthogonal (rectangular) arrays. @@ -487,7 +443,7 @@ - + Qt::Vertical @@ -503,38 +459,82 @@ + + + + + 1 + 0 + + + + + + + + Dimension + + + + + + + columns = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + rows = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + + 0 + 0 + + + + + + + + + 1 + 0 + + + + + + + + + 1 + 0 + + + + - - - - Qt::Vertical - - - - 20 - 120 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 4 - - - - @@ -558,12 +558,12 @@ angle_le mirror_cbx array_grp - rows_le columns_le - row_x_le - row_y_le + rows_le column_x_le column_y_le + row_x_le + row_y_le diff --git a/src/edt/edt/InstPropertiesPage.ui b/src/edt/edt/InstPropertiesPage.ui index f389d23f1..78e5ba162 100644 --- a/src/edt/edt/InstPropertiesPage.ui +++ b/src/edt/edt/InstPropertiesPage.ui @@ -455,51 +455,7 @@ 6 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 1 - 0 - - - - - - - - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + QFrame::NoFrame @@ -533,20 +489,7 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + y = @@ -556,58 +499,7 @@ - - - - Rows/Columns - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 1 - 0 - - - - - - - - - - - - 1 - 0 - - - - - + QFrame::NoFrame @@ -628,85 +520,44 @@ 0 - - - - - 1 - 0 - - - - - - - - Column vector (x,y) - - - - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + This is instance [r,c] of array with - - - - - 1 - 0 - + + + + Qt::Horizontal - + + + 40 + 20 + + + - - + + - columns = + Rows/Columns - - - - rows = - - - - + Row vector (x,y) - + false @@ -750,6 +601,155 @@ + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Column vector (x,y) + + + + + + + + 1 + 0 + + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 1 + 0 + + + + + + + + + + + rows = + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + 1 + 0 + + + + + + + + + 1 + 0 + + + + + + + + + 1 + 0 + + + + + + + + columns = + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -885,17 +885,17 @@ mirror_cbx mag_le array_grp - rows_le columns_le - row_x_le - row_y_le + rows_le column_x_le column_y_le + row_x_le + row_y_le dbu_cb abs_cb - prop_pb sel_pb inst_pb + prop_pb diff --git a/src/edt/edt/MakeArrayOptionsDialog.ui b/src/edt/edt/MakeArrayOptionsDialog.ui index 85d66bf52..dc3d3ef15 100644 --- a/src/edt/edt/MakeArrayOptionsDialog.ui +++ b/src/edt/edt/MakeArrayOptionsDialog.ui @@ -1,43 +1,44 @@ - + + MakeArrayOptionsDialog - - + + 0 0 - 540 + 606 332 - + Make Array - - - 9 - - + + 6 + + 9 + - - + + The selection will be copied row * columns times. Each copy will be displaced by a vector given by the row vector times the row index and the column vector times the column index. - + true - + Qt::Vertical - + QSizePolicy::Fixed - + 20 10 @@ -46,171 +47,157 @@ - - - - 7 - 0 + + + 0 0 - + Rows And Columns - + false - - + + 9 - + 6 - - - - - 0 - 0 + + + + 1 0 - - - - rows = - - - - - - - - 0 - 0 - 1 - 0 - - - - - - - - columns = - - - - - - + + + Rows/Columns - - - + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + + + + + rows = + + + + + + Row vector (x,y) - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + columns = - - - - - 0 - 0 + + + + 1 0 - - - + + + + + 1 + 0 + + + + + + + y = - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - 0 + + + + 1 0 - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - 1 - 0 - - - - - - - + + + x = - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - 0 + + + + 1 0 - - - + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + Column vector (x,y) @@ -220,13 +207,13 @@ - + Qt::Vertical - + QSizePolicy::Fixed - + 20 10 @@ -235,24 +222,21 @@ - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Warning</span>: undo is available for this function only for small arrays (less than 1000 instances)</p></body></html> + + + <span style=" font-weight:600;">Warning</span>: undo is available for this function only for small arrays (less than 1000 instances) - + true - + Qt::Vertical - + 200 51 @@ -261,17 +245,25 @@ p, li { white-space: pre-wrap; } - - + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + columns_le + rows_le + column_x_le + column_y_le + row_x_le + row_y_le + @@ -280,11 +272,11 @@ p, li { white-space: pre-wrap; } MakeArrayOptionsDialog accept() - + 248 254 - + 157 274 @@ -296,11 +288,11 @@ p, li { white-space: pre-wrap; } MakeArrayOptionsDialog reject() - + 316 260 - + 286 274 From bcfbd50ad62b4d869a4e475f7a876a88c91f790a Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 23 Mar 2024 23:02:42 +0100 Subject: [PATCH 2/2] Some polishing --- src/edt/edt/EditorOptionsInst.ui | 269 +++++++++++------------ src/edt/edt/InstPropertiesPage.ui | 294 ++++++++++++++------------ src/edt/edt/MakeArrayOptionsDialog.ui | 116 +++++----- 3 files changed, 364 insertions(+), 315 deletions(-) diff --git a/src/edt/edt/EditorOptionsInst.ui b/src/edt/edt/EditorOptionsInst.ui index 63e963d20..2e3474e37 100644 --- a/src/edt/edt/EditorOptionsInst.ui +++ b/src/edt/edt/EditorOptionsInst.ui @@ -52,7 +52,7 @@ 0 0 402 - 506 + 513 @@ -359,107 +359,7 @@ 2 - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 1 - 0 - - - - - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Row vector - - - - - - - Column vector - - - - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 1 - 0 - - - - - - - - Warning: although row and column vectors can be arbitrary combination, some design systems only accept orthogonal (rectangular) arrays. - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 4 - - - - - @@ -469,27 +369,10 @@ - - + + - Dimension - - - - - - - columns = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - rows = + y = Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -512,7 +395,127 @@ - + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Warning: although row and column vectors can be arbitrary combination, some design systems only accept orthogonal (rectangular) arrays. + + + true + + + + + + + + 1 + 0 + + + + + + + + + 1 + 0 + + + + + + + + Row vector + + + + + + + Rows = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 4 + + + + + + + + Column vector + + + + + + + Columns = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + @@ -522,15 +525,21 @@ - - - - - 1 - 0 - + + + + Qt::Vertical - + + QSizePolicy::Fixed + + + + 20 + 5 + + + diff --git a/src/edt/edt/InstPropertiesPage.ui b/src/edt/edt/InstPropertiesPage.ui index 78e5ba162..2b0e64048 100644 --- a/src/edt/edt/InstPropertiesPage.ui +++ b/src/edt/edt/InstPropertiesPage.ui @@ -455,7 +455,114 @@ 6 - + + + + + 1 + 0 + + + + + + + + + 1 + 0 + + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Row vector (x,y) + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QFrame::NoFrame @@ -489,75 +596,7 @@ - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - This is instance [r,c] of array with - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Rows/Columns - - - - - - - Row vector (x,y) - - - - + false @@ -601,34 +640,7 @@ - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Column vector (x,y) - - - - - - - - 1 - 0 - - - - - + QFrame::NoFrame @@ -662,22 +674,29 @@ - + - rows = + Rows = - - + + + + Column vector (x,y) + + + + + QFrame::NoFrame QFrame::Raised - + 0 @@ -693,7 +712,7 @@ - + @@ -703,53 +722,62 @@ - - - - - 1 - 0 - + + + + Qt::Horizontal - - - - - - - 1 - 0 - + + + 40 + 20 + - + - + - columns = - - - - - - - x = + Columns = Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + - x = + This is instance [r,c] of array with + + + + + + + y = Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + diff --git a/src/edt/edt/MakeArrayOptionsDialog.ui b/src/edt/edt/MakeArrayOptionsDialog.ui index dc3d3ef15..25e43bdb3 100644 --- a/src/edt/edt/MakeArrayOptionsDialog.ui +++ b/src/edt/edt/MakeArrayOptionsDialog.ui @@ -6,8 +6,8 @@ 0 0 - 606 - 332 + 561 + 323 @@ -67,7 +67,7 @@ 6 - + @@ -77,14 +77,7 @@ - - - - Rows/Columns - - - - + x = @@ -95,7 +88,7 @@ - + 1 @@ -104,34 +97,20 @@ + + + + Columns = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + - rows = - - - - - - - Row vector (x,y) - - - - - - - columns = - - - - - - - - 1 - 0 - + Rows = @@ -145,18 +124,22 @@ - - + + - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Row vector (x,y) - - + + + + Column vector (x,y) + + + + + 1 @@ -165,7 +148,7 @@ - + x = @@ -175,8 +158,8 @@ - - + + 1 @@ -185,7 +168,17 @@ - + + + + + 1 + 0 + + + + + y = @@ -195,13 +188,32 @@ - - + + - Column vector (x,y) + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + +