.travis.yml

@@ -1,26 +0,0 @@
-language: cpp
-compiler: gcc
-sudo: require
-dist: trusty
-
-before_install:
-    - sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
-    - sudo apt-get update -qq
-    
-install: 
-    - sudo apt-get -y install qt58base qt58serialport qt58tools
-    - source /opt/qt58/bin/qt58-env.sh
-
-script:
-  - qmake PREFIX=/usr
-  - make -j4
-  - sudo make INSTALL_ROOT=appdir install ; sudo chown -R $USER appdir ; find appdir/
-
-after_success:
-  - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
-  - chmod a+x linuxdeployqt*.AppImage
-  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs
-  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage
-  - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
-  - curl --upload-file ./RepRaptor*.AppImage https://transfer.sh/RepRaptor-git.$(git rev-parse --short HEAD)-x86_64.AppImage

README.md

@@ -1,5 +1,5 @@
 ![RepRaptor logo](http://reprap.org/mediawiki/images/b/b0/RepRaptor_logo2.png)
-# RepRaptor [![Build Status](https://travis-ci.org/NeoTheFox/RepRaptor.svg?branch=master)](https://travis-ci.org/NeoTheFox/RepRaptor)
+# RepRaptor
 A Qt RepRap gcode sender/host controller aimed to be fast and minimalistic.
 
 Right now the project is in early stage. This means some features are still absent, but it is already usable.

RepRaptor.desktop

@@ -1,8 +1,9 @@
 [Desktop Entry]
 Name=RepRaptor
 Comment=A Qt RepRap gcode sender/host controller aimed to be fast and minimalistic.
-Exec=RepRaptor
+Exec=/usr/bin/RepRaptor
-Icon=repraptor
+Icon=/usr/share/icons/repraptor.png
 Terminal=false
 Type=Application
 Categories=Utility;Application;
+

RepRaptor.pro

@@ -71,5 +71,4 @@ RESOURCES += \
 DISTFILES += \
     LICENCE \
     README.md \
-    RepRaptor.desktop \
+    RepRaptor.desktop
-    .travis.yml

mainwindow.cpp

@@ -40,7 +40,6 @@ MainWindow::MainWindow(QWidget *parent) :
     recentMenu->setTitle("Recent files");
     ui->menuFile->insertMenu(ui->actionSettings, recentMenu);
     ui->menuFile->insertSeparator(ui->actionSettings);
-    terminalCursor = ui->terminal->textCursor();
 
     //Init baudrate combobox
     ui->baudbox->addItem(QString::number(4800));
@@ -80,10 +79,6 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->checktemp->setChecked(checkingTemperature);
     ui->etmpspin->setValue(settings.value("user/extrudertemp", 210).toInt());
     ui->btmpspin->setValue(settings.value("user/bedtemp", 60).toInt());
-    ui->stepspin->setValue(settings.value("user/step", 1).toInt());
-    ui->estepspin->setValue(settings.value("user/estep", 1).toInt());
-    ui->terminal->document()->setMaximumBlockCount(
-                settings.value("core/logbuffersize", 1000).toInt());
     echo = settings.value("core/echo", 0).toBool();
     autolock = settings.value("core/lockcontrols", 0).toBool();
     chekingSDStatus = settings.value("core/checksdstatus", 1).toBool();
@@ -92,8 +87,6 @@ MainWindow::MainWindow(QWidget *parent) :
     feedrate = settings.value("feedrate", 1500).toInt();
     extruderFeedrate = settings.value("extruderfeedrate", 200).toInt();
     trayIconEnabled = settings.value("core/trayiconenabled", 1).toBool();
-    supressWait = settings.value("user/supresswait", 0).toBool();
-    lastDir.append(settings.value("user/lastdir", "").toString());
     int size = settings.beginReadArray("user/recentfiles");
     for(int i = 0; i < size; ++i)
     {
@@ -126,6 +119,7 @@ MainWindow::MainWindow(QWidget *parent) :
     //Parser thread signal-slots and init
     parserWorker->moveToThread(parserThread);
     connect(parserThread, &QThread::finished, parserWorker, &QObject::deleteLater);
+    connect(this, &MainWindow::receivedData, parserWorker, &Parser::parse);
     connect(this, &MainWindow::startedReadingEEPROM, parserWorker, &Parser::setEEPROMReadingMode);
     connect(parserWorker, &Parser::receivedTemperature, this, &MainWindow::updateTemperature);
     connect(parserWorker, &Parser::receivedSDFilesList, this, &MainWindow::initSDprinting);
@@ -146,8 +140,8 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(parserWorker, &Parser::receivedResend, senderWorker, &Sender::receivedResend);
     connect(parserWorker, &Parser::receivedStart, senderWorker, &Sender::receivedStart);
     connect(senderWorker, &Sender::errorReceived, this, &MainWindow::serialError);
-    connect(senderWorker, &Sender::dataReceived, parserWorker, &Parser::parse);
+    connect(senderWorker, &Sender::dataReceived, parserWorker, &Parser::parse, Qt::QueuedConnection);
-    connect(senderWorker, &Sender::dataReceived, this, &MainWindow::readSerial);
+    connect(senderWorker, &Sender::dataReceived, this, &MainWindow::readSerial, Qt::QueuedConnection);
     connect(senderWorker, &Sender::reportProgress, this, &MainWindow::updateFileProgress);
     connect(senderWorker, &Sender::baudrateSetFailed, this, &MainWindow::baudrateSetFailed);
     connect(this, &MainWindow::setFile, senderWorker, &Sender::setFile);
@@ -188,9 +182,6 @@ MainWindow::~MainWindow()
     settings.setValue("core/checktemperature", ui->checktemp->isChecked());
     settings.setValue("user/extrudertemp", ui->etmpspin->value());
     settings.setValue("user/bedtemp", ui->btmpspin->value());
-    settings.setValue("user/step", ui->stepspin->value());
-    settings.setValue("user/estep", ui->estepspin->value());
-    settings.setValue("user/lastdir", lastDir);
     settings.beginWriteArray("user/recentfiles");
     for(int i = 0; i < recentFiles.size(); ++i)
     {
@@ -217,30 +208,11 @@ void MainWindow::open()
     sdprinting = false;
     QString filename;
     QDir home;
-    if(lastDir == "")
-    {
     filename = QFileDialog::getOpenFileName(this,
                                             tr("Open GCODE"),
                                             home.home().absolutePath(),
                                             "GCODE (*.g *.gco *.gcode *.nc)");
-    }
-    else
-    {
-        filename = QFileDialog::getOpenFileName(this,
-                                                tr("Open GCODE"),
-                                                lastDir,
-                                                "GCODE (*.g *.gco *.gcode *.nc)");
-    }
     if(filename.isEmpty() || filename.isNull()) return;
-    //Remember the last folder
-    lastDir.clear();
-    lastDir.append(filename);
-    int filenameChars = 0;
-    for(int i = filename.count()-1; filename.at(i) != QDir::separator(); i--)
-    {
-        filenameChars++; //Count how many characters are in the filename
-    }
-    lastDir.remove(lastDir.count()-filenameChars, filenameChars);//remove filename
     gfile.setFileName(filename);
     if(!recentFiles.contains(filename))
     {
@@ -632,16 +604,15 @@ void MainWindow::readSerial(QByteArray data)
 
 void MainWindow::printMsg(QString text)
 {
-    if(supressWait && text.startsWith("wait")) return;
     //Get the cursor and set it to the end
-    terminalCursor.movePosition(QTextCursor::End);
+    QTextCursor cursor = ui->terminal->textCursor();
+    cursor.movePosition(QTextCursor::End);
 
     //Paste the text
-    terminalCursor.insertText(text);
+    cursor.insertText(text);
 
-    //Scroll to the bottom
+    //Apply
-    ui->terminal->verticalScrollBar()->setValue(
+    ui->terminal->setTextCursor(cursor);
-                ui->terminal->verticalScrollBar()->maximum());
 }
 
 void MainWindow::checkStatus()
@@ -956,8 +927,6 @@ void MainWindow::updatesettings()
     statusTimer->setInterval(settings.value("core/statusinterval", 3000).toInt());
     feedrate = settings.value("feedrate", 1500).toInt();
     extruderFeedrate = settings.value("extruderfeedrate", 200).toInt();
-    ui->terminal->document()->setMaximumBlockCount(
-                settings.value("core/logbuffersize", 1000).toInt());
 }
 
 //Needed for keypress handling

mainwindow.h

@@ -59,7 +59,6 @@ protected:
     QStringList EEPROMSettings;
     QStringList userHistory;
     QSerialPortInfo printerinfo;
-    QTextCursor terminalCursor;
 
     void closeEvent(QCloseEvent *event);
     bool eventFilter(QObject *target, QEvent *event);
@@ -67,7 +66,6 @@ protected:
 private:
     Ui::MainWindow *ui;
 
-    QString lastDir;
     bool opened;
     bool firstrun;
     bool autolock;
@@ -79,7 +77,6 @@ private:
     bool echo;
     bool chekingSDStatus;
     bool trayIconEnabled;
-    bool supressWait;
     int firmware;
     int feedrate;
     int extruderFeedrate;
@@ -159,6 +156,7 @@ private slots:
 
 signals:
     void sdReady();
+    void receivedData(QByteArray);
     void startedReadingEEPROM();
 
     void openPort(QSerialPortInfo i);

repraptor.h

@@ -6,7 +6,7 @@
 #define REPRAPTOR_H
 
 #ifndef REPRAPTOR_VERSION
-#define REPRAPTOR_VERSION "0.3.9"
+#define REPRAPTOR_VERSION "0.3.8"
 #endif
 
 namespace RepRaptor

settingswindow.cpp

@@ -25,8 +25,6 @@ SettingsWindow::SettingsWindow(QWidget *parent) :
     ui->checksumbox->setChecked(settings.value("core/checksums", 0).toBool());
     ui->sdbox->setChecked(settings.value("core/checksdstatus", 1).toBool());
     ui->dtrbox->setChecked(settings.value("core/dtr", 1).toBool());
-    ui->supresswaitbox->setChecked(settings.value("user/supresswait").toBool());
-    ui->bufferbox->setValue(settings.value("core/logbuffersize", 1000).toInt());
 
     ui->firmwarecombo->addItem("Marlin"); //0
     ui->firmwarecombo->addItem("Repetier"); //1
@@ -62,8 +60,6 @@ void SettingsWindow::on_buttonBox_accepted()
     settings.setValue("core/checksdstatus", ui->sdbox->isChecked());
     settings.setValue("core/dtr", ui->dtrbox->isChecked());
     settings.setValue("printer/firmware", ui->firmwarecombo->currentIndex());
-    settings.setValue("user/supresswait", ui->supresswaitbox->isChecked());
-    settings.setValue("core/logbuffersize", ui->bufferbox->value());
 
     emit updatesettings();
 }

settingswindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>603</width>
+    <width>483</width>
-    <height>491</height>
+    <height>341</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,28 +18,47 @@
     <normaloff>:/icons/settings.png</normaloff>:/icons/settings.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="minimumSize">
-      <size>
-       <width>200</width>
-       <height>400</height>
-      </size>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab_general">
-      <attribute name="title">
-       <string>General</string>
-      </attribute>
-      <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="internalGroup">
      <property name="title">
       <string>Internal</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Sender</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2">
+       <widget class="QComboBox" name="flowcontrolbox">
+        <property name="toolTip">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_11">
+        <property name="text">
+         <string>Flow control</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="dtrbox">
+        <property name="text">
+         <string>DTR</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>ms</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="1">
        <widget class="QDoubleSpinBox" name="senderbox">
         <property name="toolTip">
@@ -81,14 +100,14 @@
         </property>
        </widget>
       </item>
-          <item row="2" column="0">
+      <item row="1" column="2">
-           <widget class="QLabel" name="label_2">
+       <widget class="QLabel" name="label_3">
         <property name="text">
-             <string>Status</string>
+         <string>ms</string>
         </property>
        </widget>
       </item>
-          <item row="10" column="0">
+      <item row="9" column="0">
        <widget class="QCheckBox" name="checksumbox">
         <property name="enabled">
          <bool>true</bool>
@@ -98,13 +117,6 @@
         </property>
        </widget>
       </item>
-          <item row="9" column="0" colspan="3">
-           <widget class="QCheckBox" name="sdbox">
-            <property name="text">
-             <string>Check SD printing status</string>
-            </property>
-           </widget>
-          </item>
       <item row="0" column="0" colspan="3">
        <widget class="QLabel" name="label_7">
         <property name="minimumSize">
@@ -127,56 +139,28 @@
         </property>
        </widget>
       </item>
-          <item row="4" column="0">
+      <item row="2" column="0">
-           <widget class="QLabel" name="label_11">
+       <widget class="QLabel" name="label_2">
         <property name="text">
-             <string>Flow control</string>
+         <string>Status</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="0">
-           <widget class="QCheckBox" name="dtrbox">
-            <property name="text">
-             <string>DTR</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>ms</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>ms</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Sender</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1" colspan="2">
-           <widget class="QComboBox" name="flowcontrolbox">
-            <property name="toolTip">
-             <string/>
         </property>
        </widget>
       </item>
       <item row="8" column="0" colspan="3">
+       <widget class="QCheckBox" name="sdbox">
+        <property name="text">
+         <string>Check SD printing status</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="3">
        <widget class="QCheckBox" name="lockbox">
         <property name="text">
          <string>Lock controls when printing</string>
         </property>
        </widget>
       </item>
-          <item row="7" column="0">
+      <item row="6" column="0">
        <widget class="QCheckBox" name="traybox">
         <property name="enabled">
          <bool>true</bool>
@@ -189,53 +173,11 @@
         </property>
        </widget>
       </item>
-          <item row="11" column="0" colspan="2">
-           <widget class="QCheckBox" name="supresswaitbox">
-            <property name="text">
-             <string>Supress &quot;wait&quot; responce</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_12">
-            <property name="text">
-             <string>Log buffer</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QSpinBox" name="bufferbox">
-            <property name="maximum">
-             <number>100000</number>
-            </property>
-            <property name="value">
-             <number>1000</number>
-            </property>
-           </widget>
-          </item>
      </layout>
     </widget>
    </item>
-      </layout>
+   <item row="0" column="1">
-     </widget>
-     <widget class="QWidget" name="tab_network">
-      <attribute name="title">
-       <string>Network</string>
-      </attribute>
-     </widget>
-     <widget class="QWidget" name="tab_hardware">
-      <attribute name="title">
-       <string>Hardware</string>
-      </attribute>
     <widget class="QGroupBox" name="groupBox">
-       <property name="geometry">
-        <rect>
-         <x>10</x>
-         <y>20</y>
-         <width>249</width>
-         <height>171</height>
-        </rect>
-       </property>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
        <horstretch>0</horstretch>
@@ -330,10 +272,8 @@ feedrate</string>
       </item>
      </layout>
     </widget>
-     </widget>
-    </widget>
    </item>
-   <item row="1" column="0">
+   <item row="2" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>