diff --git a/src/edt/edt/EditorOptionsInst.ui b/src/edt/edt/EditorOptionsInst.ui index 5d5c8a5aa..2e3474e37 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 + 513 @@ -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,13 +359,6 @@ 2 - - - - Column step - - - @@ -347,26 +369,6 @@ - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 1 - 0 - - - - @@ -377,91 +379,7 @@ - - - - - 1 - 0 - - - - - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 1 - 0 - - - - - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Row step - - - - - - - Dimension - - - - - - - columns = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 1 - 0 - - - - - - - - rows = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - @@ -477,7 +395,17 @@ - + + + + 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. @@ -487,7 +415,54 @@ + + + + + 1 + 0 + + + + + + + + + 1 + 0 + + + + + + + Row vector + + + + + + + Rows = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + + Qt::Vertical @@ -503,38 +478,72 @@ + + + + Column vector + + + + + + + Columns = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + - - - - Qt::Vertical - - - - 20 - 120 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 4 - - - - @@ -558,12 +567,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..2b0e64048 100644 --- a/src/edt/edt/InstPropertiesPage.ui +++ b/src/edt/edt/InstPropertiesPage.ui @@ -455,15 +455,98 @@ 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 @@ -476,30 +559,10 @@ 0 - - - - - 1 - 0 - - - - - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + QFrame::NoFrame @@ -533,180 +596,7 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Rows/Columns - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 1 - 0 - - - - - - - - - - - - 1 - 0 - - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 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 - - - - - - - - columns = - - - - - - - rows = - - - - - - - Row vector (x,y) - - - - + false @@ -750,6 +640,144 @@ + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 1 + 0 + + + + + + + + + + + Rows = + + + + + + + Column vector (x,y) + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + 1 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Columns = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + This is instance [r,c] of array with + + + + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + @@ -885,17 +913,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..25e43bdb3 100644 --- a/src/edt/edt/MakeArrayOptionsDialog.ui +++ b/src/edt/edt/MakeArrayOptionsDialog.ui @@ -1,43 +1,44 @@ - + + MakeArrayOptionsDialog - - + + 0 0 - 540 - 332 + 561 + 323 - + 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,187 +47,185 @@ - - - - 7 - 0 + + + 0 0 - + Rows And Columns - + false - - + + 9 - + 6 - - - - - 0 - 0 + + + + 1 0 - - - - rows = + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - 0 + + + + 1 0 - - - - columns = + + + + Columns = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - Rows/Columns + + + + Rows = - - - + + + + + 1 + 0 + + + + + + + Row vector (x,y) - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 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 - - - - - - - + + + Column vector (x,y) + + + + + 1 + 0 + + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + + + + + + 1 + 0 + + + + + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + - + Qt::Vertical - + QSizePolicy::Fixed - + 20 10 @@ -235,24 +234,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 +257,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 +284,11 @@ p, li { white-space: pre-wrap; } MakeArrayOptionsDialog accept() - + 248 254 - + 157 274 @@ -296,11 +300,11 @@ p, li { white-space: pre-wrap; } MakeArrayOptionsDialog reject() - + 316 260 - + 286 274