Skip to content
Snippets Groups Projects
Commit 9c3a54cd authored by Gatien Ferret's avatar Gatien Ferret
Browse files

Merge branch 'minor/KeepOnlyLVBrand' into 'master'

[minor] Keep only branding from LidarView

See merge request LidarView/lidarview!140
parents 6704b3d0 19f6b822
Branches master
No related merge requests found
......@@ -16,7 +16,7 @@
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="logo.svg"
inkscape:export-filename="/home/bjacquet/Dev/VeloView/VeloView/Splash.png"
inkscape:export-filename="/home/About.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45">
<defs
......
......@@ -16,7 +16,7 @@
version="1.1"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="LidarView-splash.svg"
inkscape:export-filename="/home/bjacquet/Dev/VeloView/VeloView-New/SoftwareInformation/LidarView-Aboutbox-splash.png"
inkscape:export-filename="/home/Lidarview-about-splash.png"
inkscape:export-xdpi="59.882999"
inkscape:export-ydpi="59.882999">
<defs
......
......@@ -16,7 +16,7 @@
id="svg7638"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="LidarView.svg"
inkscape:export-filename="/home/bjacquet/Dev/VeloView/VeloView-New/SoftwareInformation/LidarView.png"
inkscape:export-filename="/home/Lidarview.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45">
<defs
......
......@@ -16,7 +16,7 @@
id="svg7011"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="ParaviewLidar.svg"
inkscape:export-filename="/home/bjacquet/Dev/VeloView/VeloView-New/SoftwareInformation/ParaviewLidar.png"
inkscape:export-filename="/home/ParaviewLidar.png"
inkscape:export-xdpi="293.58936"
inkscape:export-ydpi="293.58936">
<defs
......
......@@ -104,7 +104,7 @@ void lqOpenPcapReaction::createSourceFromFile(QString fileName)
return;
}
// Create a progress bar so the user see that VeloView is running
// Create a progress bar so the user see that LidarView is running
QProgressDialog progress("Reading pcap", "", 0, 0, lqLidarViewManager::getMainWindow());
progress.setCancelButton(nullptr);
progress.setModal(true);
......@@ -213,7 +213,7 @@ void lqOpenPcapReaction::createSourceFromFile(QString fileName)
}
}
// Remove the handler so the user can interact with VeloView again (pushing any button)
// Remove the handler so the user can interact with LidarView again (pushing any button)
handler->RemoveObserver(tag);
handler->LocalCleanupPendingProgress();
handler->SetProgressInterval(interval);
......
......@@ -48,7 +48,7 @@ def showDialog(mainWindow):
copyrightText = '''<h1>{0} {1} {2}</h1><br/>
Copyright (c) 2013-2017, Velodyne Lidar,
Copyright (c) 2016-2022, Kitware<br />
Provided by <a href="https://www.lidarview.org">Your company name</a>, coded by <a href="https://www.kitware.com">Kitware</a>.<br />
Provided by <a href="http://www.lidarview.org">Your company name</a>, coded by <a href="https://www.kitware.com">Kitware</a>.<br />
<br />
'''.format(appName, appVersionTag, appBitTag)
w('copyrightLabel').setText(copyrightText)
......
......@@ -36,7 +36,7 @@ import LidarPlugin.LidarCore # NOQA
class AppLogic(object):
def __init__(self):
# WIP This can be removed through Statusbar creation and python wrappings in VeloViewManager
# WIP This can be removed through Statusbar creation and python wrappings in lqLidarViewManager
# Fields that Can be overriden to show some statuses
self.filenameLabel = QtGui.QLabel()
self.sensorInformationLabel = QtGui.QLabel()
......@@ -205,7 +205,7 @@ def UpdateApplogicCommon(lidar):
# Reset Scene Time # WIP TIME CONTROLLER API ?
smp.GetActiveView().ViewTime = 0.0
# Used by lqVeloViewManager
# Used by lqLidarViewManager
def UpdateApplogicLidar(lidarProxyName, gpsProxyName):
sensor = smp.FindSource(lidarProxyName) #WIP use getSensor() and getPosOr()
......@@ -234,7 +234,7 @@ def UpdateApplogicLidar(lidarProxyName, gpsProxyName):
showSourceInSpreadSheet(sensor)
smp.Render()
# Used by lqVeloViewManager
# Used by lqLidarViewManager
def UpdateApplogicReader(lidarName, posOrName): # WIP could explicit send Proxy using _getPyProxy(vtkSMProxy)
reader = getReader()
......@@ -843,7 +843,7 @@ def getAnimationScene():
if proxy.GetXMLName() == 'AnimationScene' and len(proxy.Cues):
return proxy
# Main function, Used by lqVeloViewManager
# Main function, Used by lqLidarViewManager
def start():
global app
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment