ASCII curve export: better defaults

see #656
NatronGitHub · Jul 20, 2021 · f064207 · f064207
1 parent 41a3a50
commit f064207
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 5 deletions.
diff --git a/Gui/CurveWidget.cpp b/Gui/CurveWidget.cpp
@@ -148,6 +148,12 @@ CurveWidget::~CurveWidget()
     makeCurrent();
 }
 
+bool
+CurveWidget::hasTimeline() const
+{
+    return bool(_imp->_timeline);
+}
+
 void
 CurveWidget::initializeGL()
 {

diff --git a/Gui/CurveWidget.h b/Gui/CurveWidget.h
@@ -80,6 +80,8 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
 
     virtual ~CurveWidget() OVERRIDE;
 
+    bool hasTimeline() const;
+
     const QFont & getTextFont() const;
 
     void centerOn(double xmin, double xmax);

diff --git a/Gui/CurveWidgetDialogs.cpp b/Gui/CurveWidgetDialogs.cpp
@@ -61,7 +61,7 @@ NATRON_NAMESPACE_ENTER
 ImportExportCurveDialog::ImportExportCurveDialog(bool isExportDialog,
                                                  const std::vector<CurveGuiPtr> & curves,
                                                  Gui* gui,
-                                                 QWidget* parent)
+                                                 CurveWidget* parent)
     : QDialog(parent)
     , _gui(gui)
     , _isExportDialog(isExportDialog)
@@ -91,7 +91,34 @@ ImportExportCurveDialog::ImportExportCurveDialog(bool isExportDialog,
 
     bool integerIncrement = false;
     double xstart, xend;
-    gui->getApp()->getProject()->getFrameRange(&xstart, &xend);
+    QString incr;
+    if ( parent->hasTimeline() ) {
+        gui->getApp()->getFrameRange(&xstart, &xend);
+        incr = QString::fromUtf8("1");
+    } else {
+        xstart = std::numeric_limits<double>::infinity();
+        xend = -std::numeric_limits<double>::infinity();
+        for (size_t i = 0; i < curves.size(); ++i) {
+            std::pair<double, double> r = curves[i]->getInternalCurve()->getXRange();
+            if (r.first < xstart) {
+                xstart = r.first;
+            }
+            if (r.second > xend) {
+                xend = r.second;
+            }
+        }
+        if ( xstart == std::numeric_limits<double>::infinity() ) {
+            xstart = 0.;
+        }
+        if ( xend == -std::numeric_limits<double>::infinity() ) {
+            xend = 1.;
+        }
+        if (xstart == 0. && xend == 1.) {
+            incr = QString::fromUtf8("1./255.");
+        } else {
+            incr = QString::number(xend - xstart) + QString::fromUtf8("/100.");
+        }
+    }
     for (size_t i = 0; i < curves.size(); ++i) {
         integerIncrement |= curves[i]->areKeyFramesTimeClampedToIntegers();
     }
@@ -135,7 +162,7 @@ ImportExportCurveDialog::ImportExportCurveDialog(bool isExportDialog,
     _incrLayout->addWidget(_incrLabel);
     _incrLineEdit = new LineEdit(_incrContainer);
     if (xstart == 0. && xend == 1.) {
-        _incrLineEdit->setText(QString::fromUtf8("1"));
+        _incrLineEdit->setText(incr);
     } else {
         _incrLineEdit->setText(QString::number(1));
     }

diff --git a/Gui/CurveWidgetDialogs.h b/Gui/CurveWidgetDialogs.h
@@ -59,7 +59,7 @@ class ImportExportCurveDialog
     ImportExportCurveDialog(bool isExportDialog,
                             const std::vector<CurveGuiPtr> & curves,
                             Gui* gui,
-                            QWidget* parent = 0);
+                            CurveWidget* parent = 0);
 
     virtual ~ImportExportCurveDialog();
     QString getFilePath();

diff --git a/Gui/CurveWidgetPrivate.cpp b/Gui/CurveWidgetPrivate.cpp
@@ -89,7 +89,7 @@ CurveWidgetPrivate::CurveWidgetPrivate(Gui* gui,
     , _selectedKeyFramesCrossVertLine()
     , _selectedKeyFramesCrossHorizLine()
     , _timeline(timeline)
-    , _timelineEnabled(false)
+    , _timelineEnabled(bool(timeline))
     , _selectedDerivative()
     , _evaluateOnPenUp(false)
     , _keyDragLastMovement()