--- a/src/dialogs/subfilereferenceeditor.ui Wed May 30 22:31:06 2018 +0300 +++ b/src/dialogs/subfilereferenceeditor.ui Mon Jun 04 23:12:40 2018 +0300 @@ -13,7 +13,7 @@ <property name="windowTitle"> <string>Dialog</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0"> + <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0,0"> <item> <widget class="QTreeView" name="primitivesTreeView"/> </item> @@ -60,269 +60,21 @@ </item> </layout> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Position:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="DoubleSpinBox" name="positionX"> - <property name="prefix"> - <string>𝑥 = </string> - </property> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item> - <widget class="DoubleSpinBox" name="positionY"> - <property name="prefix"> - <string>𝑦 = </string> - </property> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item> - <widget class="DoubleSpinBox" name="positionZ"> - <property name="prefix"> - <string>𝑧 = </string> - </property> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - </layout> - </item> - <item row="3" column="1"> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Transformation matrix:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <layout class="QGridLayout" name="matrixLayout"> - <item row="1" column="1"> - <widget class="DoubleSpinBox" name="matrixE"> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="DoubleSpinBox" name="matrixA"> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="DoubleSpinBox" name="matrixG"> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="DoubleSpinBox" name="matrixH"> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="DoubleSpinBox" name="matrixI"> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="DoubleSpinBox" name="matrixF"> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="DoubleSpinBox" name="matrixC"> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="DoubleSpinBox" name="matrixD"> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="DoubleSpinBox" name="matrixB"> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>-10000.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - </layout> - </item> - <item row="6" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Scaling vector:</string> - </property> - </widget> - </item> - <item row="6" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="DoubleSpinBox" name="scalingX"> - <property name="prefix"> - <string>𝑥 × </string> - </property> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>0.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item> - <widget class="DoubleSpinBox" name="scalingY"> - <property name="prefix"> - <string>𝑦 × </string> - </property> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>0.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - <item> - <widget class="DoubleSpinBox" name="scalingZ"> - <property name="prefix"> - <string>𝑧 × </string> - </property> - <property name="decimals"> - <number>5</number> - </property> - <property name="minimum"> - <double>0.000000000000000</double> - </property> - <property name="maximum"> - <double>10000.000000000000000</double> - </property> - </widget> - </item> - </layout> - </item> - <item row="5" column="1"> - <widget class="Line" name="line_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> </layout> </item> <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Transformation</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="MatrixEditor" name="matrixEditor" native="true"/> + </item> + </layout> + </widget> + </item> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -336,30 +88,16 @@ </widget> <customwidgets> <customwidget> - <class>DoubleSpinBox</class> - <extends>QDoubleSpinBox</extends> - <header>widgets/doublespinbox.h</header> + <class>MatrixEditor</class> + <extends>QWidget</extends> + <header>widgets/matrixeditor.h</header> + <container>1</container> </customwidget> </customwidgets> <tabstops> <tabstop>primitivesTreeView</tabstop> <tabstop>referenceName</tabstop> <tabstop>colorButton</tabstop> - <tabstop>positionX</tabstop> - <tabstop>positionY</tabstop> - <tabstop>positionZ</tabstop> - <tabstop>matrixA</tabstop> - <tabstop>matrixB</tabstop> - <tabstop>matrixC</tabstop> - <tabstop>matrixD</tabstop> - <tabstop>matrixE</tabstop> - <tabstop>matrixF</tabstop> - <tabstop>matrixG</tabstop> - <tabstop>matrixH</tabstop> - <tabstop>matrixI</tabstop> - <tabstop>scalingX</tabstop> - <tabstop>scalingY</tabstop> - <tabstop>scalingZ</tabstop> </tabstops> <resources/> <connections>