Skip to content

Commit

Permalink
update README and add Authors and License to UI
Browse files Browse the repository at this point in the history
  • Loading branch information
CongliangLi committed Apr 13, 2022
1 parent 6177fa9 commit 24684e3
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ cd labelImg3D

***

## Author Home
## Authors Home
[Congliang Li](https://github.com/CongliangLi)
[Shijie Sun](https://github.com/ShijieS)

Expand Down
5 changes: 5 additions & 0 deletions labelImg3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ def __init__(self, data_dir):
self.ui.actionPaste.triggered.connect(self.ui.vtk_panel.paste)
self.ui.actioncopy_scene.triggered.connect(self.ui.vtk_panel.copy_scene)

# About
self.ui.actionCongliang_Li.triggered.connect(self.ui.vtk_panel.author_Congliang_Li)
self.ui.actionShijie_Sun.triggered.connect(self.ui.vtk_panel.author_Shijie_Sun)
self.ui.actionLicense.triggered.connect(self.ui.vtk_panel.license)

# rotate
for s in ['X', 'Y', 'Z', 'X_M', 'Y_M', 'Z_M']:
eval('self.ui.actionRoate{}.triggered.connect'.format(s))(eval('self.property3d.roate{}'.format(s)))
Expand Down
21 changes: 21 additions & 0 deletions libs/Ui_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ def setupUi(self, MainWindow):
self.menuTools.setObjectName("menuTools")
self.menuConfig = QtWidgets.QMenu(self.menubar)
self.menuConfig.setObjectName("menuConfig")
self.menuAbout = QtWidgets.QMenu(self.menubar)
self.menuAbout.setObjectName("menuAbout")
self.menuAuthors = QtWidgets.QMenu(self.menuAbout)
self.menuAuthors.setObjectName("menuAuthors")
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(MainWindow)
self.statusbar.setObjectName("statusbar")
Expand Down Expand Up @@ -95,6 +99,12 @@ def setupUi(self, MainWindow):
self.actionSystem_Config.setObjectName("actionSystem_Config")
self.actioncopy_scene = QtWidgets.QAction(MainWindow)
self.actioncopy_scene.setObjectName("actioncopy_scene")
self.actionLicense = QtWidgets.QAction(MainWindow)
self.actionLicense.setObjectName("actionLicense")
self.actionCongliang_Li = QtWidgets.QAction(MainWindow)
self.actionCongliang_Li.setObjectName("actionCongliang_Li")
self.actionShijie_Sun = QtWidgets.QAction(MainWindow)
self.actionShijie_Sun.setObjectName("actionShijie_Sun")
self.menuExport.addAction(self.actionKITTI)
self.menu.addAction(self.action_Load_Scenes)
self.menu.addAction(self.action_Save_Scenes)
Expand All @@ -119,10 +129,16 @@ def setupUi(self, MainWindow):
self.menuEdit.addAction(self.actioncopy_scene)
self.menuTools.addAction(self.actionkitti_2_labelimg3D)
self.menuConfig.addAction(self.actionSystem_Config)
self.menuAuthors.addAction(self.actionCongliang_Li)
self.menuAuthors.addAction(self.actionShijie_Sun)
self.menuAbout.addAction(self.menuAuthors.menuAction())
self.menuAbout.addSeparator()
self.menuAbout.addAction(self.actionLicense)
self.menubar.addAction(self.menu.menuAction())
self.menubar.addAction(self.menuEdit.menuAction())
self.menubar.addAction(self.menuConfig.menuAction())
self.menubar.addAction(self.menuTools.menuAction())
self.menubar.addAction(self.menuAbout.menuAction())

self.retranslateUi(MainWindow)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
Expand All @@ -135,6 +151,8 @@ def retranslateUi(self, MainWindow):
self.menuEdit.setTitle(_translate("MainWindow", "Edit"))
self.menuTools.setTitle(_translate("MainWindow", "Tools"))
self.menuConfig.setTitle(_translate("MainWindow", "Config"))
self.menuAbout.setTitle(_translate("MainWindow", "About"))
self.menuAuthors.setTitle(_translate("MainWindow", "Authors"))
self.action_Load_Scenes.setText(_translate("MainWindow", "&Load Scenes"))
self.action_Load_Scenes.setShortcut(_translate("MainWindow", "Ctrl+O"))
self.action_Save_Scenes.setText(_translate("MainWindow", "&Save Scenes"))
Expand Down Expand Up @@ -171,4 +189,7 @@ def retranslateUi(self, MainWindow):
self.actionSystem_Config.setText(_translate("MainWindow", "System Config"))
self.actioncopy_scene.setText(_translate("MainWindow", "Copy_Scene"))
self.actioncopy_scene.setShortcut(_translate("MainWindow", "Ctrl+Space"))
self.actionLicense.setText(_translate("MainWindow", "License"))
self.actionCongliang_Li.setText(_translate("MainWindow", "Congliang Li"))
self.actionShijie_Sun.setText(_translate("MainWindow", "Shijie Sun"))
from libs.slabel3dannotation import SLabel3DAnnotation
31 changes: 31 additions & 0 deletions libs/main.ui
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,26 @@
</property>
<addaction name="actionSystem_Config"/>
</widget>
<widget class="QMenu" name="menuAbout">
<property name="title">
<string>About</string>
</property>
<widget class="QMenu" name="menuAuthors">
<property name="title">
<string>Authors</string>
</property>
<addaction name="actionCongliang_Li"/>
<addaction name="actionShijie_Sun"/>
</widget>
<addaction name="menuAuthors"/>
<addaction name="separator"/>
<addaction name="actionLicense"/>
</widget>
<addaction name="menu"/>
<addaction name="menuEdit"/>
<addaction name="menuConfig"/>
<addaction name="menuTools"/>
<addaction name="menuAbout"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<action name="action_Load_Scenes">
Expand Down Expand Up @@ -267,6 +283,21 @@
<string>Ctrl+Space</string>
</property>
</action>
<action name="actionLicense">
<property name="text">
<string>License</string>
</property>
</action>
<action name="actionCongliang_Li">
<property name="text">
<string>Congliang Li</string>
</property>
</action>
<action name="actionShijie_Sun">
<property name="text">
<string>Shijie Sun</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
Expand Down
16 changes: 14 additions & 2 deletions libs/slabel3dannotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import numpy as np
from pathlib import Path
from libs.lsystem_config import SystemConfig

import webbrowser

# from PIL import Image

Expand Down Expand Up @@ -516,7 +516,7 @@ def model_update_with_property(self, is_changed):
# self.style.InteractionProp.SetOrientation([data[i + 3] for i in range(3)])

Rotate = [round(Ro, 2) for Ro in self.style.InteractionProp.GetOrientation()]
data =[data[0]] + [data[i+1] for i in range(3)] + [Rotate[i] for i in range(3)]
data = [data[0]] + [data[i + 1] for i in range(3)] + [Rotate[i] for i in range(3)]

self.parent().parent().property3d.update_property(data)

Expand Down Expand Up @@ -580,3 +580,15 @@ def copy_scene(self):

self.loadScenes(scene_folder, os.path.join(images_folder, image_name_list[current_index]),
os.path.join(annotations_folder, annotations_list[current_index]))

def author_Congliang_Li(self):
print("Congliang Li")
webbrowser.open('https://github.com/CongliangLi')

def author_Shijie_Sun(self):
print("Shijie Sun")
webbrowser.open('https://github.com/ShijieS')

def license(self):
print("License")
webbrowser.open('https://creativecommons.org/licenses/by-nc-sa/3.0/')

0 comments on commit 24684e3

Please sign in to comment.