Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Zhang, Tong
Online Model App
Commits
e05ec953
Commit
e05ec953
authored
Jul 26, 2021
by
Doerr, Kevin
Browse files
Merged and fixed conflict errors
parent
81b4c9b5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/myApp/ui/ui_app.ui
View file @
e05ec953
...
...
@@ -6,8 +6,8 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
1
341
</width>
<height>
6
87
</height>
<width>
1
653
</width>
<height>
6
50
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
...
...
@@ -256,6 +256,60 @@
</widget>
</widget>
</item>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QTableWidget"
name=
"tableWidget"
>
<row>
<property
name=
"text"
>
<string>
x(y)_c [mm]
</string>
</property>
</row>
<row>
<property
name=
"text"
>
<string>
a(b)_c [mm]
</string>
</property>
</row>
<row>
<property
name=
"text"
>
<string>
x(y)m [mm]
</string>
</property>
</row>
<row>
<property
name=
"text"
>
<string>
a(b)m [mm]
</string>
</property>
</row>
<row>
<property
name=
"text"
>
<string>
eps_x(y)
</string>
</property>
</row>
<row>
<property
name=
"text"
>
<string>
alpha_x(y)
</string>
</property>
</row>
<row>
<property
name=
"text"
>
<string>
beta_x(y)
</string>
</property>
</row>
<row>
<property
name=
"text"
>
<string>
gamma_x(y)
</string>
</property>
</row>
<column>
<property
name=
"text"
>
<string>
X
</string>
</property>
</column>
<column>
<property
name=
"text"
>
<string>
Y
</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
<widget
class=
"QMenuBar"
name=
"menubar"
>
...
...
@@ -263,8 +317,8 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
1
341
</width>
<height>
30
</height>
<width>
1
653
</width>
<height>
24
</height>
</rect>
</property>
<widget
class=
"QMenu"
name=
"menu_File"
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment