Upgrade for latest feather-tk

Dockerfile

@@ -0,0 +1,64 @@
+# -*- mode: sh -*-
+# vi: set ft=bash :
+
+FROM ubuntu:latest AS builder
+
+WORKDIR /home/ubuntu
+
+RUN apt-get update && apt-get install -y build-essential \
+			      cmake \
+			      g++ \
+			      git \
+			      minizip \
+			      libminizip-ng-dev \
+			      xorg-dev \
+			      libglu1-mesa-dev \
+			      mesa-common-dev \
+			      mesa-utils \
+			      curl \
+			      pipx \
+			      libjpeg-dev \
+			      libtiff-dev \
+			      libpng++-dev \
+			      libimath-dev \
+			      libopencv-dev \
+			      ffmpeg \
+			      libyaml-cpp-dev \
+			      libavcodec-dev \
+			      libavformat-dev \
+			      libswscale-dev \
+			      openimageio-tools \
+			      libopenexr-dev \
+			      libopenimageio-dev \
+			      libopencolorio-dev \
+			      libopentimelineio-dev
+
+# Clone, compile and install feather-tk library
+RUN mkdir feather-tk
+RUN cd feather-tk; git clone https://github.com/grizzlypeak3d/feather-tk.git
+RUN cd feather-tk; sh feather-tk/sbuild-linux.sh feather-tk
+# TODO replace with cmake --target install 
+RUN tar -C feather-tk/install-Release -c -f - . | tar -C /usr/local -x -f -
+
+# Add the pipx installation location:
+ENV PATH=/root/.local/share/pipx/venvs/conan/bin:$PATH
+
+# We need conan for openFX building.
+RUN pipx ensurepath
+RUN pipx install conan
+RUN conan profile detect
+
+# TODO Unable to get it because of github blocking automation.
+# curl -O https://github.com/AcademySoftwareFoundation/openfx/releases/download/OFX_Release_1.5.1/openfx-linux-ubuntu-1.5.1.tar.gz
+RUN git clone https://github.com/AcademySoftwareFoundation/openfx.git
+# TODO this doesn't build on arm64 Linux currently, can't find the architecture.
+RUN cd openfx; scripts/build-cmake.sh
+# TODO need to find a better installation method, cmake --target install
+RUN mkdir /usr/local/include/OpenFX
+RUN tar -C openfx/include -c -f - . | tar -C /usr/local/include/OpenFX -x -f -
+
+# RUN git clone https://github.com/OpenTimelineIO/toucan.git
+# RUN git clone https://github.com/leighsmith/toucan.git
+COPY . /home/ubuntu/toucan
+
+# RUN sh toucan/sbuild-linux.sh

bin/toucan-filmstrip/App.cpp

@@ -15,10 +15,10 @@ namespace toucan
         const std::shared_ptr<ftk::Context>& context,
         std::vector<std::string>& argv)
     {
-        _cmdLine.input = ftk::CmdLineValueArg<std::string>::create(
+        _cmdLine.input = ftk::CmdLineArg<std::string>::create(
             "input",
             "Input .otio file.");
-        _cmdLine.output = ftk::CmdLineValueArg<std::string>::create(
+        _cmdLine.output = ftk::CmdLineArg<std::string>::create(
             "output",
             "Output image file.");
 
@@ -44,7 +44,12 @@ namespace toucan
         out->_init(context, argv);
         return out;
     }
-
+
+    int App::getExit() const
+    {
+        return 0; // TODO stub for now to replace deprecated API of feather-tk IApp.h.
+    }
+
     void App::run()
     {
         const std::filesystem::path parentPath = std::filesystem::path(getExeName()).parent_path();

bin/toucan-filmstrip/App.h

@@ -30,13 +30,16 @@ namespace toucan
             const std::shared_ptr<ftk::Context>&,
             std::vector<std::string>&);
 
-        void run() override;
+         //! Get the exit code.
+         FTK_API int getExit() const;
+
+         void run();
 
     private:
         struct CmdLine
         {
-            std::shared_ptr<ftk::CmdLineValueArg<std::string> > input;
-            std::shared_ptr<ftk::CmdLineValueArg<std::string> > output;
+            std::shared_ptr<ftk::CmdLineArg<std::string> > input;
+            std::shared_ptr<ftk::CmdLineArg<std::string> > output;
         };
         CmdLine _cmdLine;
 

bin/toucan-render/App.cpp

@@ -47,10 +47,10 @@ namespace toucan
         const std::shared_ptr<ftk::Context>& context,
         std::vector<std::string>& argv)
     {
-        _cmdLine.input = ftk::CmdLineValueArg<std::string>::create(
+        _cmdLine.input = ftk::CmdLineArg<std::string>::create(
             "input",
             "Input .otio file.");
-        _cmdLine.output = ftk::CmdLineValueArg<std::string>::create(
+        _cmdLine.output = ftk::CmdLineArg<std::string>::create(
             "output",
             "Output image or movie file. Use a dash ('-') to write raw frames or y4m to stdout.");
 
@@ -64,37 +64,37 @@ namespace toucan
         {
             y4mList.push_back(spec.first);
         }
-        _cmdLine.videoCodec = ftk::CmdLineValueOption<std::string>::create(
+        _cmdLine.videoCodec = ftk::CmdLineOption<std::string>::create(
             std::vector<std::string>{ "-vcodec" },
             "Set the video codec.",
             "",
             "MJPEG",
             ftk::join(ffmpeg::getVideoCodecStrings(), ", "));
-        _cmdLine.printStart = ftk::CmdLineFlagOption::create(
+        _cmdLine.printStart = ftk::CmdLineFlag::create(
             std::vector<std::string>{ "-print_start" },
             "Print the timeline start time and exit.");
-        _cmdLine.printDuration = ftk::CmdLineFlagOption::create(
+        _cmdLine.printDuration = ftk::CmdLineFlag::create(
             std::vector<std::string>{ "-print_duration" },
             "Print the timeline duration and exit.");
-        _cmdLine.printRate = ftk::CmdLineFlagOption::create(
+        _cmdLine.printRate = ftk::CmdLineFlag::create(
             std::vector<std::string>{ "-print_rate" },
             "Print the timeline frame rate and exit.");
-        _cmdLine.printSize = ftk::CmdLineFlagOption::create(
+        _cmdLine.printSize = ftk::CmdLineFlag::create(
             std::vector<std::string>{ "-print_size" },
             "Print the timeline image size.");
-        _cmdLine.raw = ftk::CmdLineValueOption<std::string>::create(
+        _cmdLine.raw = ftk::CmdLineOption<std::string>::create(
             std::vector<std::string>{ "-raw" },
             "Raw pixel format to send to stdout.",
             "",
             std::optional<std::string>(),
             ftk::join(rawList, ", "));
-        _cmdLine.y4m = ftk::CmdLineValueOption<std::string>::create(
+        _cmdLine.y4m = ftk::CmdLineOption<std::string>::create(
             std::vector<std::string>{ "-y4m" },
             "y4m format to send to stdout.",
             "",
             std::optional<std::string>(),
             ftk::join(y4mList, ", "));
-        _cmdLine.verbose = ftk::CmdLineFlagOption::create(
+        _cmdLine.verbose = ftk::CmdLineFlag::create(
             std::vector<std::string>{ "-v" },
             "Print verbose output.");
 
@@ -149,6 +149,11 @@ namespace toucan
         return out;
     }
 
+    int App::getExit() const
+    {
+        return 0; // TODO stub for now to replace deprecated API of feather-tk IApp.h.
+    }
+
     void App::run()
     {
         const std::filesystem::path parentPath = std::filesystem::path(getExeName()).parent_path();

bin/toucan-render/App.h

@@ -36,7 +36,10 @@ namespace toucan
             const std::shared_ptr<ftk::Context>&,
             std::vector<std::string>&);
 
-        void run() override;
+        //! Get the exit code.
+        FTK_API int getExit() const;
+
+        void run();
 
     private:
         void _writeRawFrame(const OIIO::ImageBuf&);
@@ -45,18 +48,18 @@ namespace toucan
 
         struct CmdLine
         {
-            std::shared_ptr<ftk::CmdLineValueArg<std::string> > input;
-            std::shared_ptr<ftk::CmdLineValueArg<std::string> > output;
+            std::shared_ptr<ftk::CmdLineArg<std::string> > input;
+            std::shared_ptr<ftk::CmdLineArg<std::string> > output;
             bool outputRaw = false;
 
-            std::shared_ptr<ftk::CmdLineValueOption<std::string> > videoCodec;
-            std::shared_ptr<ftk::CmdLineFlagOption> printStart;
-            std::shared_ptr<ftk::CmdLineFlagOption> printDuration;
-            std::shared_ptr<ftk::CmdLineFlagOption> printRate;
-            std::shared_ptr<ftk::CmdLineFlagOption> printSize;
-            std::shared_ptr<ftk::CmdLineValueOption<std::string> > raw;
-            std::shared_ptr<ftk::CmdLineValueOption<std::string> > y4m;
-            std::shared_ptr<ftk::CmdLineFlagOption> verbose;
+            std::shared_ptr<ftk::CmdLineOption<std::string> > videoCodec;
+            std::shared_ptr<ftk::CmdLineFlag> printStart;
+            std::shared_ptr<ftk::CmdLineFlag> printDuration;
+            std::shared_ptr<ftk::CmdLineFlag> printRate;
+            std::shared_ptr<ftk::CmdLineFlag> printSize;
+            std::shared_ptr<ftk::CmdLineOption<std::string> > raw;
+            std::shared_ptr<ftk::CmdLineOption<std::string> > y4m;
+            std::shared_ptr<ftk::CmdLineFlag> verbose;
         };
         CmdLine _cmdLine;
 

lib/toucanView/App.cpp

@@ -26,7 +26,7 @@ namespace toucan
         const std::shared_ptr<ftk::Context>& context,
         std::vector<std::string>& argv)
     {
-        _input = ftk::CmdLineValueArg<std::string>::create(
+        _input = ftk::CmdLineArg<std::string>::create(
             "input",
             "Input timeline.",
             true);
@@ -56,7 +56,7 @@ namespace toucan
             std::dynamic_pointer_cast<App>(shared_from_this()),
             "toucan-view",
             ftk::Size2I(1920, 1080));
-        addWindow(_window);
+        _addWindow(_window);
         _window->show();
 
         if (_input->hasValue())

lib/toucanView/App.h

@@ -55,7 +55,7 @@ namespace toucan
         void open(const std::filesystem::path&);
 
     private:
-        std::shared_ptr<ftk::CmdLineValueArg<std::string> > _input;
+        std::shared_ptr<ftk::CmdLineArg<std::string> > _input;
         std::shared_ptr<ftk::Settings> _settings;
         std::shared_ptr<TimeUnitsModel> _timeUnitsModel;
         std::shared_ptr<ImageEffectHost> _host;

lib/toucanView/BackgroundTool.cpp

@@ -97,7 +97,7 @@ namespace toucan
                 }
             });
 
-        _optionsObserver = ftk::ValueObserver<GlobalViewOptions>::create(
+        _optionsObserver = ftk::Observer<GlobalViewOptions>::create(
             _model->observeOptions(),
             [this](const GlobalViewOptions& value)
             {
@@ -125,10 +125,9 @@ namespace toucan
         _scrollWidget->setGeometry(value);
     }
 
-    void BackgroundTool::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I BackgroundTool::getSizeHint() const
     {
-        IToolWidget::sizeHintEvent(event);
-        _setSizeHint(_scrollWidget->getSizeHint());
+        return _scrollWidget->getSizeHint();
     }
 
     void BackgroundTool::_widgetUpdate()

lib/toucanView/BackgroundTool.h

@@ -36,7 +36,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         void _widgetUpdate();
@@ -52,7 +52,7 @@ namespace toucan
         std::shared_ptr<ftk::ColorWidget> _checkersColor1Widget;
         std::shared_ptr<ftk::IntEditSlider> _checkersSizeSlider;
 
-        std::shared_ptr<ftk::ValueObserver<GlobalViewOptions> > _optionsObserver;
+        std::shared_ptr<ftk::Observer<GlobalViewOptions> > _optionsObserver;
     };
 }
 

lib/toucanView/CompareMenu.cpp

@@ -24,8 +24,7 @@ namespace toucan
 
         _actions["Compare/A"] = ftk::Action::create(
             "A",
-            ftk::Key::A,
-            static_cast<int>(ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::A, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -36,8 +35,7 @@ namespace toucan
 
         _actions["Compare/B"] = ftk::Action::create(
             "B",
-            ftk::Key::B,
-            static_cast<int>(ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::B, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -48,8 +46,7 @@ namespace toucan
 
         _actions["Compare/Split"] = ftk::Action::create(
             "Split",
-            ftk::Key::S,
-            static_cast<int>(ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::S, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -60,8 +57,7 @@ namespace toucan
 
         _actions["Compare/Overlay"] = ftk::Action::create(
             "Overlay",
-            ftk::Key::E,
-            static_cast<int>(ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::E, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -72,8 +68,7 @@ namespace toucan
 
         _actions["Compare/Horizontal"] = ftk::Action::create(
             "Horizontal",
-            ftk::Key::H,
-            static_cast<int>(ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::H, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -84,8 +79,7 @@ namespace toucan
 
         _actions["Compare/Vertical"] = ftk::Action::create(
             "Vertical",
-            ftk::Key::V,
-            static_cast<int>(ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::V, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -94,7 +88,7 @@ namespace toucan
             });
         addAction(_actions["Compare/Vertical"]);
 
-        _modeObserver = ftk::ValueObserver<CompareOptions>::create(
+        _modeObserver = ftk::Observer<CompareOptions>::create(
             app->getFilesModel()->observeCompareOptions(),
             [this](const CompareOptions& value)
             {
@@ -126,15 +120,15 @@ namespace toucan
                 }
             });
 
-        _fileObserver = ftk::ValueObserver<std::shared_ptr<File> >::create(
+        _fileObserver = ftk::Observer<std::shared_ptr<File> >::create(
             app->getFilesModel()->observeCurrent(),
             [this](const std::shared_ptr<File>& file)
             {
                 _file = file;
                 _menuUpdate();
             });
 
-        _bIndexObserver = ftk::ValueObserver<int>::create(
+        _bIndexObserver = ftk::Observer<int>::create(
             _filesModel->observeBIndex(),
             [this](int index)
             {

lib/toucanView/CompareMenu.h

@@ -45,8 +45,8 @@ namespace toucan
         std::vector<std::shared_ptr<ftk::Action> > _bFileActions;
 
         std::shared_ptr<ftk::ListObserver<std::shared_ptr<File> > > _filesObserver;
-        std::shared_ptr<ftk::ValueObserver<std::shared_ptr<File> > > _fileObserver;
-        std::shared_ptr<ftk::ValueObserver<int> > _bIndexObserver;
-        std::shared_ptr<ftk::ValueObserver<CompareOptions> > _modeObserver;
+        std::shared_ptr<ftk::Observer<std::shared_ptr<File> > > _fileObserver;
+        std::shared_ptr<ftk::Observer<int> > _bIndexObserver;
+        std::shared_ptr<ftk::Observer<CompareOptions> > _modeObserver;
     };
 }