quick update

stmoon · Oct 3, 2020 · 8ae6050 · 8ae6050
1 parent dcbcdb2
commit 8ae6050
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 30 deletions.
diff --git a/docs/appimage_howto.md b/docs/appimage_howto.md
@@ -1,22 +1,43 @@
 # Build the AppImage with catkin_make
 
-In the root folder of ws_plotjuggler:
-
-    wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-    wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
-
-    chmod +x linuxdeploy*.AppImage
+Cleanup and build
 
     rm -rf build devel install AppDir
     catkin_make -DCMAKE_BUILD_TYPE=Release  -j$(nproc) install  
 
     cd src/PlotJuggler;export VERSION=$(git describe --abbrev=0 --tags);cd -;echo $VERSION
-
+
+## Method 1
+
+In the root folder of ws_plotjuggler:
+
+    wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage  ~/linuxdeploy-x86_64.AppImage
+    wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage ~/linuxdeploy-plugin-qt-x86_64.AppImage
+    chmod +x ~/linuxdeploy*.AppImage
+
     mkdir -p AppDir/usr/bin/
     cp install/lib/plotjuggler/* AppDir/usr/bin
 
     ./linuxdeploy-x86_64.AppImage --appdir=AppDir -d src/PlotJuggler/PlotJuggler.desktop -i src/PlotJuggler/plotjuggler-icon.png  --plugin qt --output appimage
      
+## Method 2
+
+    wget "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" -O ~/linuxdeployq.AppImage
+    chmod +x ~/linuxdeployq.AppImage
+
+    cp src/PlotJuggler/PlotJuggler.desktop ./install/lib/plotjuggler/
+    cp src/PlotJuggler/plotjuggler.png     ./install/lib/plotjuggler/
+
+    ~/linuxdeployq.AppImage ./install/lib/plotjuggler/PlotJuggler.desktop -appimage -bundle-non-qt-libs -no-strip -extra-plugins=iconengines,imageformats
+
+If you have problems with the dependencies of the PJ plugins, additionally:
+
+    cp src/PlotJuggler/PlotJuggler.desktop ./AppDir/
+    cp src/PlotJuggler/plotjuggler.png     ./AppDir/
+    cp src/PlotJuggler/AppRun              ./AppDir/
+
+    ~/appimagetool-x86_64.AppImage AppDir/
+
 
 
 
diff --git a/plotjuggler.png b/plotjuggler.png
diff --git a/plotter_gui/mainwindow.cpp b/plotter_gui/mainwindow.cpp
@@ -166,15 +166,15 @@ MainWindow::MainWindow(const QCommandLineParser& commandline_parser, QWidget* pa
   this->setMenuBar(ui->menuBar);
   ui->menuBar->setNativeMenuBar(false);
 
-  if (_test_option)
-  {
-    connect(ui->actionLoadDummyData, &QAction::triggered, this, &MainWindow::buildDummyData);
-    buildDummyData();
-  }
-  else
-  {
-    ui->actionLoadDummyData->setVisible(false);
-  }
+//  if (_test_option)
+//  {
+//    connect(ui->actionLoadDummyData, &QAction::triggered, this, &MainWindow::buildDummyData);
+//    buildDummyData();
+//  }
+//  else
+//  {
+//    ui->actionLoadDummyData->setVisible(false);
+//  }
 
   bool file_loaded = false;
   if (commandline_parser.isSet("datafile"))
@@ -501,7 +501,7 @@ void MainWindow::initializePlugins(QString directory_name)
           else{
             auto options_button = new QPushButton(ui->framePublishers);
             options_button->setFlat(true);
-            options_button->setFixedSize({22,22});
+            options_button->setFixedSize({24,24});
             ui->layoutPublishers->addWidget(options_button, row, 2);
 
             options_button->setIcon( LoadSvgIcon(":/resources/svg/settings_cog.svg", "light"));

diff --git a/plotter_gui/mainwindow.ui b/plotter_gui/mainwindow.ui
@@ -248,7 +248,7 @@
                <property name="maximumSize">
                 <size>
                  <width>24</width>
-                 <height>22</height>
+                 <height>24</height>
                 </size>
                </property>
                <property name="toolTip">
@@ -259,8 +259,8 @@
                </property>
                <property name="iconSize">
                 <size>
-                 <width>14</width>
-                 <height>14</height>
+                 <width>12</width>
+                 <height>12</height>
                 </size>
                </property>
                <property name="flat">
@@ -388,8 +388,8 @@
                </property>
                <property name="iconSize">
                 <size>
-                 <width>14</width>
-                 <height>14</height>
+                 <width>12</width>
+                 <height>12</height>
                 </size>
                </property>
                <property name="flat">
@@ -533,6 +533,11 @@
                 <property name="enabled">
                  <bool>false</bool>
                 </property>
+                <property name="font">
+                 <font>
+                  <pointsize>10</pointsize>
+                 </font>
+                </property>
                 <property name="toolTip">
                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the streaming plugin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
@@ -566,8 +571,8 @@
                 </property>
                 <property name="iconSize">
                  <size>
-                  <width>20</width>
-                  <height>20</height>
+                  <width>16</width>
+                  <height>16</height>
                  </size>
                 </property>
                 <property name="flat">
@@ -1827,11 +1832,6 @@
     <string>Save each tab as a separate image.</string>
    </property>
   </action>
-  <action name="actionLoadDummyData">
-   <property name="text">
-    <string>Load Dummy Data</string>
-   </property>
-  </action>
   <action name="actionFunctionEditor">
    <property name="text">
     <string>Open Function Editor</string>

diff --git a/plotter_gui/plotwidget.cpp b/plotter_gui/plotwidget.cpp
@@ -1938,7 +1938,7 @@ bool PlotWidget::isZoomEnabled() const
 }
 
 void PlotWidget::replot()
-{
+{ 
   if (_zoomer)
   {
     _zoomer->setZoomBase(false);
-Original file line number
+Diff line change
@@ Expand Up / @@ -1938,7 +1938,7 @@ bool PlotWidget::isZoomEnabled() const @@
     }
     void PlotWidget::replot()
-    {
+    {
       if (_zoomer)
       {
         _zoomer->setZoomBase(false);
@@ Expand Down @@