Merge pull request #173 from ludekvodicka/master

Fixed 32-bit compilation and ability to autoconnect via command line
yse · Feb 7, 2020 · 5ee29cd · 5ee29cd
2 parents 1653cea + 930560e
commit 5ee29cd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/profiler_gui/common_functions.cpp b/profiler_gui/common_functions.cpp
@@ -318,11 +318,12 @@ namespace profiler_gui {
     }
 
     //////////////////////////////////////////////////////////////////////////
-
+#if _WIN64 || __x86_64__ || __ppc64__
     QString shortenCountString(size_t count, int precision)
     {
         return shortenCountStringUnsigned(count, precision);
     }
+#endif
 
     QString shortenCountString(uint32_t count, int precision)
     {

diff --git a/profiler_gui/common_functions.h b/profiler_gui/common_functions.h
@@ -199,7 +199,10 @@ QString timeStringIntNs(TimeUnits _units, ::profiler::timestamp_t _interval);
 
 //////////////////////////////////////////////////////////////////////////
 
+#if _WIN64 || __x86_64__ || __ppc64__
 QString shortenCountString(size_t count, int precision = 1);
+#endif
+
 QString shortenCountString(uint32_t count, int precision = 1);
 QString shortenCountString(int64_t count, int precision = 1);
 QString shortenCountString(int count, int precision = 1);

diff --git a/profiler_gui/main_window.cpp b/profiler_gui/main_window.cpp
@@ -983,10 +983,25 @@ MainWindow::MainWindow() : Parent(), m_theme("default"), m_lastAddress("localhos
 
     loadGeometry();
 
-    if(QCoreApplication::arguments().size() > 1)
-    {
-        auto opened_filename = QCoreApplication::arguments().at(1);
-        loadFile(opened_filename);
+    if (QCoreApplication::arguments().size() > 1) {
+        QString firstArgument = QCoreApplication::arguments().at(1);
+        if (firstArgument == "-autoconnect" && QCoreApplication::arguments().size() > 2) {
+            QString address = QCoreApplication::arguments().at(2);
+            int separator = address.indexOf(':');
+            if (separator != -1) {
+                m_lastPort = address.mid(separator + 1).toInt();
+                m_lastAddress = address.mid(0, separator);
+            } else {
+                m_lastAddress = address;
+            }
+            m_addressEdit->setText(m_lastAddress);
+            m_portEdit->setText(QString::number(m_lastPort));
+            onConnectClicked(true);
+            if (EASY_GLOBALS.connected && m_listener.regime() == ListenerRegime::Idle)
+                onCaptureClicked(true);
+        } else {
+            loadFile(firstArgument);
+        }
     }
 
     using profiler_gui::GlobalSignals;