From 5ecb4d206e27c1100a2b21df9d756c0f983de8cd Mon Sep 17 00:00:00 2001 From: Guillaume Jacquemin Date: Wed, 14 Aug 2013 07:11:42 +0200 Subject: [PATCH] IanniX 0.9.13 - bug with impossibility to change ellipse size in inspector --- IanniX.pro.user | 2 +- Info.plist | 2 +- gui/uiinspector.cpp | 15 ++++++++++----- iannixapp.cpp | 2 +- icon.rc | 8 ++++---- objects/nxcursor.cpp | 4 ++-- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/IanniX.pro.user b/IanniX.pro.user index 650da74..4aeaabb 100644 --- a/IanniX.pro.user +++ b/IanniX.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/Info.plist b/Info.plist index 5d15d0e..dae7b51 100755 --- a/Info.plist +++ b/Info.plist @@ -72,6 +72,6 @@ CFBundleSignature INNX CFBundleVersion - 0.9.12 + 0.9.13 diff --git a/gui/uiinspector.cpp b/gui/uiinspector.cpp index d06b989..70d5b2c 100644 --- a/gui/uiinspector.cpp +++ b/gui/uiinspector.cpp @@ -488,7 +488,7 @@ void UiInspector::refresh() { MessageManager::transportNbGroups = Application::current->getCount(-2); actionInfoLock = true; - quint16 counterTriggers = 0, counterCurves = 0, counterCurvePoints = 0, counterCurveEquation = 0, counterCursors = 0, counterCursorsCurve = 0; + quint16 counterTriggers = 0, counterCurves = 0, counterCurvePoints = 0, counterCurveEllipse = 0, counterCurveEquation = 0, counterCursors = 0, counterCursorsCurve = 0; if((render) && (ui->tab->currentIndex() == 1)) { UiRenderSelection *objects = render->getSelection(); @@ -545,10 +545,13 @@ void UiInspector::refresh() { counterCursorsCurve++; if((object->getType() == ObjectsTypeCurve) && (((NxCurve*)object)->getCurveType() == CurveTypePoints)) counterCurvePoints++; + if((object->getType() == ObjectsTypeCurve) && (((NxCurve*)object)->getCurveType() == CurveTypeEllipse)) + counterCurveEllipse++; if((object->getType() == ObjectsTypeCurve) && ((((NxCurve*)object)->getCurveType() == CurveTypeEquationCartesian) || (((NxCurve*)object)->getCurveType() == CurveTypeEquationPolar))) counterCurveEquation++; + if (objects->count() > 1) ////CG//// Don't allow ID change if more than one object selected ui->newIdButton->setDisabled(true); else @@ -658,13 +661,15 @@ void UiInspector::refresh() { typeLabelText.chop(2); ui->typeLabel->setText(typeLabelText); - bool showCursorInfo = false, showTriggerInfo = false, showCurveInfo = false, showCurvePointsInfo = false, showCursorCurveInfo = false, showGenericInfo = false, showCurveEquationInfo = false; + bool showCursorInfo = false, showTriggerInfo = false, showCurveInfo = false, showCurvePointsInfo = false, showCurveEllipseInfo = false, showCursorCurveInfo = false, showGenericInfo = false, showCurveEquationInfo = false; if(counterCurves > 0) showCurveInfo = true; if(counterCursors > 0) showCursorInfo = true; if(counterTriggers > 0) showTriggerInfo = true; + if(counterCurveEllipse > 0) + showCurveEllipseInfo = true; if(counterCursorsCurve > 0) showCursorCurveInfo = true; if(counterCurvePoints > 0) @@ -773,9 +778,9 @@ void UiInspector::refresh() { ui->triggerOffLabel->setVisible(showTriggerInfo); ui->triggerOffSpin->setVisible(showTriggerInfo); - ui->sizeHSpin->setVisible(showCurvePointsInfo); - ui->sizeWSpin->setVisible(showCurvePointsInfo); - ui->sizeLabel->setVisible(showCurvePointsInfo); + ui->sizeHSpin->setVisible(showCurvePointsInfo || showCurveEllipseInfo); + ui->sizeWSpin->setVisible(showCurvePointsInfo || showCurveEllipseInfo); + ui->sizeLabel->setVisible(showCurvePointsInfo || showCurveEllipseInfo); ui->intertiaSpin->setVisible(showCurvePointsInfo); ui->intertiaLabel->setVisible(showCurvePointsInfo); ui->pointsLabel->setVisible(showCurvePointsInfo); diff --git a/iannixapp.cpp b/iannixapp.cpp index ad8e28a..67ecd9e 100644 --- a/iannixapp.cpp +++ b/iannixapp.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { //iannixApp.installTranslator(&translator); QString appName = "IanniX "; - QString appVersion = "0.9.12"; + QString appVersion = "0.9.13"; #ifdef Q_OS_MAC appName += "Mac"; diff --git a/icon.rc b/icon.rc index e36874f..db24fec 100644 --- a/icon.rc +++ b/icon.rc @@ -1,10 +1,10 @@ IDI_ICON1 ICON DISCARDABLE "icon.ico" #include -#define VER_FILEVERSION 0,9,12,0 -#define VER_FILEVERSION_STR "0.9,12\0" -#define VER_PRODUCTVERSION 0,9,12,0 -#define VER_PRODUCTVERSION_STR "0.9,12\0" +#define VER_FILEVERSION 0,9,13,0 +#define VER_FILEVERSION_STR "0.9,13\0" +#define VER_PRODUCTVERSION 0,9,13,0 +#define VER_PRODUCTVERSION_STR "0.9,13\0" #define VER_COMPANYNAME_STR "IanniX Association" #define VER_FILEDESCRIPTION_STR "IanniX" #define VER_INTERNALNAME_STR "IanniX" diff --git a/objects/nxcursor.cpp b/objects/nxcursor.cpp index 06815b2..5e193f4 100644 --- a/objects/nxcursor.cpp +++ b/objects/nxcursor.cpp @@ -546,8 +546,8 @@ bool NxCursor::contains(NxTrigger *trigger) const { if(depth > 0) { if(isInDepth && isInWidth && isInside) { - qDebug("A > %f %d %d %d", timeLocal, isInDepth, isInWidth, isInside); - qDebug("%d\t=\t%f\t%f => BY %d", isInside, centre1.x(), centre2.x(), trigger->cursorTrigged); + //qDebug("A > %f %d %d %d", timeLocal, isInDepth, isInWidth, isInside); + //qDebug("%d\t=\t%f\t%f => BY %d", isInside, centre1.x(), centre2.x(), trigger->cursorTrigged); trigger->lastTrigTime = timestamp; return true; }