Fixed TactonDebug (size constraints prevented the window from showing up.

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@83 47cf9a05-e0a8-4ed5-9e9b-101a649bc004

diff --git a/TactonDebug/TactonDebug.suo b/TactonDebug/TactonDebug.suo
index a996f4d29d6fedd621735021324e5ea2c645031e..95b4378c954488ffa5127b2099bacfe008f036a3 100644 (file)
Binary files a/TactonDebug/TactonDebug.suo and b/TactonDebug/TactonDebug.suo differ

diff --git a/TactonDebug/TactonDebug/main.cpp b/TactonDebug/TactonDebug/main.cpp
index 5fcd7b964af27d39a26ada9bdbca96da8ea72a0f..7cb5b80c8ee84f28edc510e5fa6015d3672bb261 100644 (file)
--- a/TactonDebug/TactonDebug/main.cpp
+++ b/TactonDebug/TactonDebug/main.cpp
@@ -6,6 +6,6 @@ int main(int argc, char *argv[])
        QApplication a(argc, argv);\r
        TactonDebug w;\r
        w.show();\r
-       w.raise();\r
+\r
        return a.exec();\r
 }\r

diff --git a/TactonDebug/TactonDebug/tactondebug.cpp b/TactonDebug/TactonDebug/tactondebug.cpp
index ebad3a9a895965344e7085c8f430465c08497b26..d25c25b434d58d0af3d7190adad3dd8852370d9e 100644 (file)
--- a/TactonDebug/TactonDebug/tactondebug.cpp
+++ b/TactonDebug/TactonDebug/tactondebug.cpp
@@ -5,7 +5,7 @@ int TactonDebug::MaxAmplitude = 255;
 int TactonDebug::MaxDuration = 2000;\r
 \r
 TactonDebug::TactonDebug(QWidget *parent, Qt::WFlags flags)\r
-       : QMainWindow(parent, flags)\r
+:QMainWindow(parent, flags)\r
 {\r
        try\r
        {\r
@@ -18,7 +18,7 @@ TactonDebug::TactonDebug(QWidget *parent, Qt::WFlags flags)
 \r
        setupUi(this);\r
 \r
-       layout()->setSizeConstraint(QLayout::SetFixedSize);\r
+       //layout()->setSizeConstraint(QLayout::SetFixedSize);\r
 \r
        QObject::connect(frequencebox, SIGNAL(textChanged(const QString &)), this, SLOT(setFrequency(const QString &)));\r
        QObject::connect(frequenceslider, SIGNAL(valueChanged(int)), this, SLOT(setFrequency(int)));\r

diff --git a/TactonDebug/TactonDebug/tactondebug.ui b/TactonDebug/TactonDebug/tactondebug.ui
index c6deb501df8e0c660e52bbbc87a1c45d1901607d..b77ca5b5a3a9bf94c2820f2f80baebd18bf3e763 100644 (file)
--- a/TactonDebug/TactonDebug/tactondebug.ui
+++ b/TactonDebug/TactonDebug/tactondebug.ui
@@ -10,6 +10,18 @@
     <height>371</height>\r
    </rect>\r
   </property>\r
+  <property name="minimumSize">\r
+   <size>\r
+    <width>231</width>\r
+    <height>371</height>\r
+   </size>\r
+  </property>\r
+  <property name="maximumSize">\r
+   <size>\r
+    <width>231</width>\r
+    <height>371</height>\r
+   </size>\r
+  </property>\r
   <property name="windowTitle">\r
    <string>TactonDebug</string>\r
   </property>\r