[Seq-cvs-commit] SF.net SVN: seq:[1342] showeq/trunk/src

[<cn...@us...>]

Revision: 1342
          http://sourceforge.net/p/seq/svn/1342
Author:   cn187
Date:     2023-03-15 18:24:14 +0000 (Wed, 15 Mar 2023)
Log Message:
-----------
Remove commented-out map optimization code

Modified Paths:
--------------
    showeq/trunk/src/map.cpp
    showeq/trunk/src/map.h
    showeq/trunk/src/mapcore.cpp
    showeq/trunk/src/mapcore.h

Modified: showeq/trunk/src/map.cpp
===================================================================
--- showeq/trunk/src/map.cpp	2023-03-15 18:24:02 UTC (rev 1341)
+++ showeq/trunk/src/map.cpp	2023-03-15 18:24:14 UTC (rev 1342)
@@ -1089,20 +1089,6 @@
   addMenu(subMenu);
 
 
-  /*
-  subMenu = new QMenu;
-  subMenu->setCheckable(true);
-  m_id_mapOptimization_Memory = subMenu->insertItem("Memory");
-  subMenu->setItemParameter(m_id_mapOptimization_Memory, tMap_MemoryOptim); 
-  m_id_mapOptimization_Normal = subMenu->insertItem("Normal");
-  subMenu->setItemParameter(m_id_mapOptimization_Normal, tMap_NormalOptim);
-  m_id_mapOptimization_Best = subMenu->insertItem("Speed");
-  subMenu->setItemParameter(m_id_mapOptimization_Best, tMap_BestOptim);
-  connect(subMenu, SIGNAL(activated(int)),
-      this, SLOT(select_mapOptimization(int)));
-  m_id_mapOptimization = insertItem("Map Optimization", subMenu);
-  */
-
   m_action_gridTickColor = addAction("Grid Tick Color...", this,
           SLOT(select_gridTickColor()));
 
@@ -1313,14 +1299,7 @@
 #ifdef DEBUG
   m_action_debugInfo->setChecked(m_map->showDebugInfo());
 #endif
-  /*
-  MapOptimizationMethod method = m_map->mapOptimization();
 
-  setItemChecked(m_id_mapOptimization_Memory, (method == tMap_MemoryOptim));
-  setItemChecked(m_id_mapOptimization_Normal, (method == tMap_NormalOptim));
-  setItemChecked(m_id_mapOptimization_Best, (method == tMap_BestOptim));
-  */
-
   m_drawSizeSpinBox->setValue(m_mapIcons->drawSize());
 
   m_fovSpinBox->setValue(m_mapIcons->fovDistance());
@@ -1552,13 +1531,6 @@
   m_map->setShowInstanceLocationMarker(!m_map->showInstanceLocationMarker());
 }
 
-/*
-void MapMenu::select_mapOptimization(int itemId)
-{
-  m_map->setMapOptimization((MapOptimizationMethod)itemParameter(itemId));
-}
-*/
-
 void MapMenu::select_gridTickColor()
 {
   QString name = QString("ShowEQ - ") + m_map->preferenceName() 
@@ -1832,11 +1804,6 @@
   tmpPrefString = "FloorRoom";
   m_param.setFloorRoom(pSEQPrefs->getPrefInt(tmpPrefString, prefString, 75));
 
-  /*
-  tmpPrefString = "OptimizeMethod";
-  m_param.setMapOptimizationMethod((MapOptimizationMethod)pSEQPrefs->getPrefInt(tmpPrefString, prefString, (int)tMap_NormalOptim));
-  */
-
   tmpPrefString = "ZoomDefault";
   m_param.setZoomDefault(pSEQPrefs->getPrefInt(tmpPrefString, prefString, 1));
 
@@ -1922,7 +1889,6 @@
   
   // Setup offscreen image
   m_offscreen = QPixmap(m_param.screenLength());
-//  m_offscreen.setOptimization(m_param.pixmapOptimizationMethod());
   
   m_mapTip = new MapLabel( this );
   this->setMouseTracking( true );
@@ -2791,21 +2757,6 @@
     refreshMap ();
 }
 
-/*
-void Map::setMapOptimization(MapOptimizationMethod method) 
-{ 
-  // set the general optimization method
-  m_param.setMapOptimizationMethod(method);
-
-  QString tmpPrefString = "OptimizeMethod";
-  pSEQPrefs->setPrefInt(tmpPrefString, preferenceName(),  
-              (int)m_param.mapOptimizationMethod());
-
-  // set the offscreen images optimization method
-  m_offscreen.setOptimization(m_param.pixmapOptimizationMethod());
-}
-*/
-
 void Map::setZoom(int val) 
 { 
   if (m_player->id() != 1)
@@ -3086,7 +3037,6 @@
   out << "BackgroundColor: " << m_param.backgroundColor().name() << endl;
   out << "HeadRoom: " << m_param.headRoom() << endl;
   out << "FloorRoom: " << m_param.floorRoom() << endl;
-//  out << "OptimizeMethod: " << (int)m_param.mapOptimizationMethod() << endl;
 
   out << endl;
   m_mapIcons->dumpInfo(out);

Modified: showeq/trunk/src/map.h
===================================================================
--- showeq/trunk/src/map.h	2023-03-15 18:24:02 UTC (rev 1341)
+++ showeq/trunk/src/map.h	2023-03-15 18:24:14 UTC (rev 1342)
@@ -275,7 +275,6 @@
   void toggle_cacheChanges();
   void toggle_zoneSafePoint();
   void toggle_instanceLocationMarker();
-  //void select_mapOptimization(int itemId);
   void select_gridTickColor();
   void select_gridLineColor();
   void select_backgroundColor();
@@ -335,12 +334,6 @@
 #ifdef DEBUG
   QAction* m_action_debugInfo;
 #endif
-  /*
-  int m_id_mapOptimization;
-  int m_id_mapOptimization_Memory;
-  int m_id_mapOptimization_Normal;
-  int m_id_mapOptimization_Best;
-  */
   QAction* m_action_gridTickColor;
   QAction* m_action_gridLineColor;
   QAction* m_action_backgroundColor;
@@ -398,10 +391,6 @@
   void          setZEM (unsigned char newZEM);
   
   // old methods
-  /*
-  MapOptimizationMethod getMapOptimization(void) 
-    { return m_param.mapOptimizationMethod(); }
-  */
   
   MapMenu* menu();
   
@@ -440,7 +429,6 @@
   bool showInstanceLocationMarker() const { return m_showInstanceLocationMarker; }
 
   MapLineStyle mapLineStyle() { return m_param.mapLineStyle(); }
-  //MapOptimizationMethod mapOptimization() { return m_param.mapOptimizationMethod(); }
   int zoom() const { return m_param.zoom(); }
   int zoomDefault() const { return m_param.zoomDefault(); }
   int panOffsetX() const { return m_param.panOffsetX(); }
@@ -540,7 +528,6 @@
   void setRacePvP(bool val);
   
   void setMapLineStyle(MapLineStyle style);
-  //void setMapOptimization(MapOptimizationMethod method);
   void setZoom(int val);
   void setZoomDefault(int val);
   void setPanOffsetX(int val);

Modified: showeq/trunk/src/mapcore.cpp
===================================================================
--- showeq/trunk/src/mapcore.cpp	2023-03-15 18:24:02 UTC (rev 1341)
+++ showeq/trunk/src/mapcore.cpp	2023-03-15 18:24:14 UTC (rev 1342)
@@ -82,7 +82,6 @@
   m_showLines = true;
   m_showGridLines = true;
   m_showGridTicks = true;
-  //m_optimization = tMap_NormalOptim;
 
   reset();
 }
@@ -234,34 +233,6 @@
   m_curPlayerOffset.setY(calcYOffset(m_curPlayer.y()));
 }
 
-#if 0
-QPixmap::Optimization MapParameters::pixmapOptimizationMethod()
-{
-  switch (m_optimization)
-  {
-  case tMap_MemoryOptim:  
-    return QPixmap::MemoryOptim; 
-  case tMap_NoOptim:
-    return QPixmap::NoOptim; 
-  case tMap_NormalOptim:  
-    return QPixmap::NormalOptim;
-  case tMap_BestOptim:  
-    return QPixmap::BestOptim;
-  case tMap_DefaultOptim:
-  default: 
-    return QPixmap::DefaultOptim;
-  }
-   /* Optimization Methods:
-        DefaultOptim - A pixmap with this optimization mode set always has the default optimization type
-               - default optimization type for qPixMap is NormalOptim
-        NoOptim      - no optimization (currently the same as MemoryOptim).
-        MemoryOptim  - optimize for minimal memory use. 
-        NormalOptim  - optimize for typical usage. Often uses more memory than MemoryOptim, and often faster. 
-        BestOptim    - optimize for pixmaps that are drawn very often and where performance is critical.
-                       Generally uses more memory than NormalOptim and may provide a little better speed
-   */
-}
-#endif
 
 void MapParameters::setPlayer(const MapPoint& pos)
 { 
@@ -2364,12 +2335,6 @@
   // increment paint count
   m_paintCount++;
 #endif
-  /*
-  // set pixmap optimization if it's changed
-  if (m_lastParam.mapOptimizationMethod() !=
-      param.mapOptimizationMethod())
-    m_mapImage.setOptimization(param.pixmapOptimizationMethod());
-    */
 
   // make sure the map is the correct size
   m_mapImage = QPixmap(param.screenLength());

Modified: showeq/trunk/src/mapcore.h
===================================================================
--- showeq/trunk/src/mapcore.h	2023-03-15 18:24:02 UTC (rev 1341)
+++ showeq/trunk/src/mapcore.h	2023-03-15 18:24:14 UTC (rev 1342)
@@ -75,22 +75,6 @@
   tMap_FadedFloors,
 };
 
-/*
- * QT4 no longer allows the user to set the pixmap optimization.
- * As a result, all of the pixmap optimization code is being commented out
- * and can be deleted once it's determined to not unexpectedly break
- * anything. - cn187
- */
-/*
-enum MapOptimizationMethod
-{
-  tMap_MemoryOptim = 0,
-  tMap_NormalOptim = 1,
-  tMap_BestOptim = 2,
-  tMap_DefaultOptim = 3,
-  tMap_NoOptim = 4,
-};
-*/
 
 //----------------------------------------------------------------------
 // constants
@@ -141,10 +125,6 @@
   const QFont& font() const { return m_font; }
   int16_t headRoom() const { return m_headRoom; }
   int16_t floorRoom() const { return m_floorRoom; }
-  /*
-  MapOptimizationMethod mapOptimizationMethod() { return m_optimization; }
-  QPixmap::Optimization pixmapOptimizationMethod();
-  */
   MapLineStyle mapLineStyle() { return m_mapLineStyle; }
   bool fadeFloors() const { return (m_mapLineStyle == tMap_FadedFloors); }
   bool depthFiltering() const { return (m_mapLineStyle == tMap_DepthFiltered); }
@@ -183,10 +163,6 @@
   void setScreenSize(const QSize& size);
   void setBackgroundColor(const QColor& color) { m_backgroundColor = color; }
   void setFont(const QFont& font) { m_font = font; }
-  /*
-  void setMapOptimizationMethod(MapOptimizationMethod method) 
-    { m_optimization = method; }  
-    */
   void setMapLineStyle(MapLineStyle style) { m_mapLineStyle = style; }
   void setShowBackgroundImage(bool val) { m_showBackgroundImage = val; }
   void setShowLocations(bool val) { m_showLocations = val; }
@@ -232,7 +208,6 @@
   MapPoint m_targetPoint;
   bool m_targetPointSet;
 
-  //MapOptimizationMethod m_optimization;
   MapLineStyle m_mapLineStyle;
   bool m_showBackgroundImage; 
   bool m_showLocations;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.