Mercurial > hg > orthanc-stone

changeset 2370:5c4491e700ad refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed useless files
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 08 Oct 2026 19:29:56 +0200
parents 7b815ead4e7d
children 3644864d95ad
files OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake OrthancStone/Sources/Scene2DViewport/MeasureTrackers.cpp OrthancStone/Sources/Scene2DViewport/MeasureTrackers.h
diffstat 3 files changed, 0 insertions(+), 227 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake	Thu Oct 08 19:28:20 2026 +0200
+++ b/OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake	Thu Oct 08 19:29:56 2026 +0200
@@ -326,7 +326,6 @@
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/MeasureCommands.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/MeasureTool.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/MeasureToolsToolbox.cpp
-  ${ORTHANC_STONE_ROOT}/Scene2DViewport/MeasureTrackers.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/OneGesturePointerTracker.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/UndoStack.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/ViewportController.cpp
--- a/OrthancStone/Sources/Scene2DViewport/MeasureTrackers.cpp	Thu Oct 08 19:28:20 2026 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/**
- * Stone of Orthanc
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2023 Osimis S.A., Belgium
- * Copyright (C) 2021-2026 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- **/
-
-#include "MeasureTrackers.h"
-#include <OrthancException.h>
-
-namespace OrthancStone
-{
-
-  CreateMeasureTracker::CreateMeasureTracker(boost::weak_ptr<IViewport> viewport) :
-    commitResult_(true),
-    viewport_(viewport),
-    alive_(true)
-  {
-  }
-
-  IViewport::ILock* CreateMeasureTracker::GetViewportLock()
-  {
-    boost::shared_ptr<IViewport> viewport = viewport_.lock();
-    if (viewport)
-      return viewport->Lock();
-    else
-      return NULL;
-  }
-
-  void CreateMeasureTracker::Cancel(Scene2D& scene)
-  {
-    commitResult_ = false;
-    alive_ = false;
-  }
-
-  bool CreateMeasureTracker::IsAlive() const
-  {
-    return alive_;
-  }
-
-  CreateMeasureTracker::~CreateMeasureTracker()
-  {
-    // if the tracker completes successfully, we add the command
-    // to the undo stack
-    // otherwise, we simply undo it
-
-    std::unique_ptr<IViewport::ILock> lock(GetViewportLock());
-
-    if(lock)
-    {
-      if (commitResult_)
-        lock->GetController().PushCommand(command_);
-      else
-        command_->Undo();
-
-      lock->Invalidate();
-    }
-  }
-
-  EditMeasureTracker::EditMeasureTracker(boost::weak_ptr<IViewport> viewport,
-    const PointerEvent& e) :
-    commitResult_(true),
-    viewport_(viewport),
-    alive_(true)
-  {
-    std::unique_ptr<IViewport::ILock> lock(GetViewportLock());
-
-    originalClickPosition_ = e.GetMainPosition().Apply(
-      lock->GetController().GetScene().GetCanvasToSceneTransform());
-  }
-
-  IViewport::ILock* EditMeasureTracker::GetViewportLock()
-  {
-    boost::shared_ptr<IViewport> viewport = viewport_.lock();
-    if (viewport)
-      return viewport->Lock();
-    else
-      return NULL;
-  }
-
-  void EditMeasureTracker::Cancel(Scene2D& scene)
-  {
-    commitResult_ = false;
-    alive_ = false;
-  }
-
-  bool EditMeasureTracker::IsAlive() const
-  {
-    return alive_;
-  }
-
-  EditMeasureTracker::~EditMeasureTracker()
-  {
-    // if the tracker completes successfully, we add the command
-    // to the undo stack
-    // otherwise, we simply undo it
-
-    std::unique_ptr<IViewport::ILock> lock(GetViewportLock());
-
-    if(lock)
-    {
-      if (commitResult_)
-        lock->GetController().PushCommand(command_);
-      else
-        command_->Undo();
-
-      lock->Invalidate();
-    }
-  }
-}
-
-
--- a/OrthancStone/Sources/Scene2DViewport/MeasureTrackers.h	Thu Oct 08 19:28:20 2026 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/**
- * Stone of Orthanc
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2023 Osimis S.A., Belgium
- * Copyright (C) 2021-2026 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- **/
-
-#pragma once
-
-#include "BaseFlexiblePointerTracker.h"
-#include "../Scene2D/Scene2D.h"
-#include "../Scene2D/PointerEvent.h"
-
-#include "MeasureTool.h"
-#include "MeasureCommands.h"
-
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
-#include <vector>
-
-namespace OrthancStone
-{
-  class CreateMeasureTracker : public BaseFlexiblePointerTracker
-  {
-  private:
-    bool  commitResult_;
-    
-  protected:
-    boost::shared_ptr<CreateMeasureCommand>  command_;
-    boost::weak_ptr<IViewport>               viewport_;
-    bool                                     alive_;
-
-    /**
-    This will return a scoped lock to the viewport.
-    If the viewport does not exist anymore, then nullptr is returned.
-    */
-    IViewport::ILock* GetViewportLock();
-
-    explicit CreateMeasureTracker(boost::weak_ptr<IViewport> viewport);
-
-    virtual ~CreateMeasureTracker();
-    
-  public:
-    virtual void Cancel(Scene2D& scene) ORTHANC_OVERRIDE;
-    
-    virtual bool IsAlive() const ORTHANC_OVERRIDE;
-  };
-
-
-  class EditMeasureTracker : public BaseFlexiblePointerTracker
-  {
-  private:
-    ScenePoint2D  originalClickPosition_;
-    bool          commitResult_;
-
-  protected:
-    boost::shared_ptr<EditMeasureCommand>  command_;
-    boost::weak_ptr<IViewport>             viewport_;
-    bool                                   alive_;
-    
-    /**
-    This will return a scoped lock to the viewport.
-    If the viewport does not exist anymore, then nullptr is returned.
-    */
-    IViewport::ILock* GetViewportLock();
-
-    EditMeasureTracker(boost::weak_ptr<IViewport> viewport,
-                       const PointerEvent& e);
-
-    ~EditMeasureTracker();
-
-    ScenePoint2D GetOriginalClickPosition() const
-    {
-      return originalClickPosition_;
-    }
-
-  public:
-    virtual void Cancel(Scene2D& scene) ORTHANC_OVERRIDE;
-    
-    virtual bool IsAlive() const ORTHANC_OVERRIDE;
-  };
-}
-