From 5d5b440ba2e81f8c188fc461c9e309e12cfd6ab2 Mon Sep 17 00:00:00 2001
From: tangchao0503 <735056338@qq.com>
Date: Thu, 12 Mar 2026 14:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0maptool?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=89=E5=BE=88=E5=A4=9A=E7=BB=86=E8=8A=82=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=81=9A=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HPPA/HPPA.cpp             |  2 +-
 HPPA/HPPA.ui              |  2 +-
 HPPA/HPPA.vcxproj         |  6 +++---
 HPPA/HPPA.vcxproj.filters | 18 +++++++++---------
 HPPA/MapTool.cpp          |  2 +-
 HPPA/MapTool.h            |  7 +------
 HPPA/MapToolPan.cpp       |  6 +++++-
 HPPA/MapToolPan.h         |  3 ++-
 HPPA/MapToolSpectral.cpp  |  6 +++++-
 HPPA/MapToolSpectral.h    |  3 ++-
 10 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/HPPA/HPPA.cpp b/HPPA/HPPA.cpp
index 350ab65..ff1b138 100644
--- a/HPPA/HPPA.cpp
+++ b/HPPA/HPPA.cpp
@@ -1023,7 +1023,7 @@ void HPPA::initMapTools()
 	connect(ui.mActionSpectral, SIGNAL(triggered()), this, SLOT(onMapToolSpectralTriggered()));
 
 	// Default tool: pan
-	ui.mActionPan->trigger();
+	//ui.mActionPan->trigger();
 }
 
 void HPPA::onMapToolPanTriggered()
diff --git a/HPPA/HPPA.ui b/HPPA/HPPA.ui
index 86d47f4..7c2dc08 100644
--- a/HPPA/HPPA.ui
+++ b/HPPA/HPPA.ui
@@ -818,7 +818,7 @@ QPushButton:pressed
   </widget>
   <widget class="QToolBar" name="mapToolBar">
    <property name="windowTitle">
-    <string>toolBar</string>
+    <string>图像查看</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
diff --git a/HPPA/HPPA.vcxproj b/HPPA/HPPA.vcxproj
index 572a9cd..fa10088 100644
--- a/HPPA/HPPA.vcxproj
+++ b/HPPA/HPPA.vcxproj
@@ -208,9 +208,9 @@
     <QtMoc Include="MapLayerStore.h" />
     <ClInclude Include="LayerTreeView.h" />
     <QtMoc Include="LayerTreeViewMenuProvider.h" />
-    <ClInclude Include="MapTool.h" />
-    <ClInclude Include="MapToolPan.h" />
-    <ClInclude Include="MapToolSpectral.h" />
+    <QtMoc Include="MapTool.h" />
+    <QtMoc Include="MapToolPan.h" />
+    <QtMoc Include="MapToolSpectral.h" />
     <ClInclude Include="RasterDataProvider.h" />
     <ClInclude Include="RasterRenderer.h" />
     <ClInclude Include="utility_tc.h" />
diff --git a/HPPA/HPPA.vcxproj.filters b/HPPA/HPPA.vcxproj.filters
index 864f33a..90e3b71 100644
--- a/HPPA/HPPA.vcxproj.filters
+++ b/HPPA/HPPA.vcxproj.filters
@@ -291,6 +291,15 @@
     <QtMoc Include="imageControl.h">
       <Filter>Header Files</Filter>
     </QtMoc>
+    <QtMoc Include="MapToolSpectral.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="MapToolPan.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="MapTool.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="imageProcessor.h">
@@ -332,15 +341,6 @@
     <ClInclude Include="LayerTreeView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MapTool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MapToolPan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MapToolSpectral.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <QtUic Include="FocusDialog.ui">
diff --git a/HPPA/MapTool.cpp b/HPPA/MapTool.cpp
index 5fc618f..97e2245 100644
--- a/HPPA/MapTool.cpp
+++ b/HPPA/MapTool.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "MapTool.h"
 #include "ImageViewer.h"
 #include <QAction>
diff --git a/HPPA/MapTool.h b/HPPA/MapTool.h
index 5a28402..bec3875 100644
--- a/HPPA/MapTool.h
+++ b/HPPA/MapTool.h
@@ -1,4 +1,4 @@
-#ifndef MAPTOOL_H
+#ifndef MAPTOOL_H
 #define MAPTOOL_H
 
 #include <QObject>
@@ -25,23 +25,18 @@ public:
 
     virtual Flags flags() const { return NoFlags; }
 
-    // Associated action �C used to auto-check / uncheck when tool is activated / deactivated
     QAction* action() const;
     void setAction(QAction* action);
 
-    // Canvas this tool operates on
     Mapcavas* canvas() const;
 
-    // Cursor shown when tool is active
     virtual void setCursor(const QCursor& cursor);
     QCursor cursor() const;
 
-    // Lifecycle
     virtual void activate();
     virtual void deactivate();
     bool isActive() const;
 
-    // Mouse event handlers �C return true if event was handled
     virtual void canvasMousePressEvent(QMouseEvent* e);
     virtual void canvasMouseReleaseEvent(QMouseEvent* e);
     virtual void canvasMouseMoveEvent(QMouseEvent* e);
diff --git a/HPPA/MapToolPan.cpp b/HPPA/MapToolPan.cpp
index 8ab0aab..16bf78f 100644
--- a/HPPA/MapToolPan.cpp
+++ b/HPPA/MapToolPan.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "MapToolPan.h"
 #include "ImageViewer.h"
 #include <QMouseEvent>
@@ -10,6 +10,10 @@ MapToolPan::MapToolPan(Mapcavas* canvas, QObject* parent)
     setCursor(Qt::OpenHandCursor);
 }
 
+MapToolPan::~MapToolPan()
+{
+}
+
 void MapToolPan::activate()
 {
     MapTool::activate();
diff --git a/HPPA/MapToolPan.h b/HPPA/MapToolPan.h
index a777083..919d1a1 100644
--- a/HPPA/MapToolPan.h
+++ b/HPPA/MapToolPan.h
@@ -1,4 +1,4 @@
-#ifndef MAPTOOLPAN_H
+#ifndef MAPTOOLPAN_H
 #define MAPTOOLPAN_H
 
 #include "MapTool.h"
@@ -10,6 +10,7 @@ class MapToolPan : public MapTool
 
 public:
     MapToolPan(Mapcavas* canvas, QObject* parent = nullptr);
+    ~MapToolPan();
 
     void activate() override;
     void deactivate() override;
diff --git a/HPPA/MapToolSpectral.cpp b/HPPA/MapToolSpectral.cpp
index 42b716b..9c1174b 100644
--- a/HPPA/MapToolSpectral.cpp
+++ b/HPPA/MapToolSpectral.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "MapToolSpectral.h"
 #include "ImageViewer.h"
 #include "RasterLayer.h"
@@ -11,6 +11,10 @@ MapToolSpectral::MapToolSpectral(Mapcavas* canvas, QObject* parent)
     setCursor(Qt::CrossCursor);
 }
 
+MapToolSpectral::~MapToolSpectral()
+{
+}
+
 void MapToolSpectral::canvasMousePressEvent(QMouseEvent* e)
 {
     if (e->button() != Qt::LeftButton)
diff --git a/HPPA/MapToolSpectral.h b/HPPA/MapToolSpectral.h
index 60a70bc..fea4838 100644
--- a/HPPA/MapToolSpectral.h
+++ b/HPPA/MapToolSpectral.h
@@ -1,4 +1,4 @@
-#ifndef MAPTOOLSPECTRAL_H
+#ifndef MAPTOOLSPECTRAL_H
 #define MAPTOOLSPECTRAL_H
 
 #include "MapTool.h"
@@ -10,6 +10,7 @@ class MapToolSpectral : public MapTool
 
 public:
     MapToolSpectral(Mapcavas* canvas, QObject* parent = nullptr);
+    ~MapToolSpectral();
 
     void canvasMousePressEvent(QMouseEvent* e) override;