GUI: Kill off Legend.html. It hasn't progressed at all since I've been

here, and doesn't offer much for our new html report. ( And if someone has the urge to better explain things, you can directly offer help tooltips in the html report ). Priest: Make sure action costs are properly floored. git-svn-id: https://simulationcraft.googlecode.com/svn/trunk@16730 3b4652a1-8050-0410-ac47-3d40261b0f8b
tjw87912 · Jun 15, 2013 · 9a5fec3 · 9a5fec3
1 parent 0156bc7
commit 9a5fec3
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 113 deletions.
diff --git a/Legend.html b/Legend.html
diff --git a/READ_ME_FIRST.txt b/READ_ME_FIRST.txt
@@ -29,7 +29,6 @@ Windows Platforms:
 (2) /profiles => All of the DPS profiles you will find in the GUI
 (3) /profiles_heal => Experimental healing and tanking profiles
 (4) /source => Source used to build the executables
-(5) Legend.html => Glossary for simulation output
 (6) READ_ME_FIRST.txt => This file
 (7) simc.exe => Command-line simulation executable
 (8) SimulationCraft.exe => Basic graphic user-interface.  Accepts drag-n-drop of .simc profiles.
@@ -40,7 +39,6 @@ Windows Platforms:
 Posix Platforms: (Linux, OSX, etc)
 (1) simc => Command-line simulation executable
 (2) simcqt.exe => Alpha-level graphic user-interface.
-(3) Legend.html => Glossary for simulation output
 
 =============================================================================================
 

diff --git a/engine/class_modules/sc_priest.cpp b/engine/class_modules/sc_priest.cpp
@@ -922,12 +922,15 @@ struct priest_action_t : public Base
     if ( ( this -> base_execute_time <= timespan_t::zero() ) && ! this -> channeled )
     {
       c *= 1.0 + priest.buffs.inner_will -> check() * priest.buffs.inner_will -> data().effectN( 1 ).percent();
-      c  = floor( c );
+      c  = std::floor( c );
     }
 
 
     if ( priest.buffs.power_infusion -> check() )
+    {
       c *= 1.0 + priest.buffs.power_infusion -> data().effectN( 2 ).percent();
+      c  = std::floor( c );
+    }
 
     return c;
   }

diff --git a/qt/sc_window.cpp b/qt/sc_window.cpp
@@ -616,34 +616,9 @@ void SC_MainWindow::createHelpTab()
 
 void SC_MainWindow::createResultsTab()
 {
-  QString s = "<div align=center><h1>Understanding SimulationCraft Output!</h1>If you are seeing this text, then Legend.html was unable to load.</div>";
-  QString legendFile = "Legend.html";
-#if defined( Q_WS_MAC ) || defined( Q_OS_MAC )
-  CFURLRef fileRef    = CFBundleCopyResourceURL( CFBundleGetMainBundle(), CFSTR( "Legend" ), CFSTR( "html" ), 0 );
-  if ( fileRef )
-  {
-    CFStringRef macPath = CFURLCopyFileSystemPath( fileRef, kCFURLPOSIXPathStyle );
-    legendFile          = CFStringGetCStringPtr( macPath, CFStringGetSystemEncoding() );
-
-    CFRelease( fileRef );
-    CFRelease( macPath );
-  }
-#endif
-
-  QFile file( legendFile );
-  if ( file.open( QIODevice::ReadOnly ) )
-  {
-    s = QString::fromUtf8( file.readAll() );
-    file.close();
-  }
-
-  QTextBrowser* legendBanner = new QTextBrowser();
-  legendBanner -> setHtml( s );
-  legendBanner -> moveCursor( QTextCursor::Start );
 
   resultsTab = new QTabWidget();
   resultsTab -> setTabsClosable( true );
-  resultsTab -> addTab( legendBanner, tr( "Legend" ) );
   connect( resultsTab, SIGNAL( currentChanged( int ) ),    this, SLOT( resultsTabChanged( int ) )      );
   connect( resultsTab, SIGNAL( tabCloseRequested( int ) ), this, SLOT( resultsTabCloseRequest( int ) ) );
   mainTab -> addTab( resultsTab, tr( "Results" ) );
@@ -1236,27 +1211,16 @@ void SC_MainWindow::importTabChanged( int index )
 
 void SC_MainWindow::resultsTabChanged( int index )
 {
-  if ( index <= 0 )
-  {
-    cmdLine -> setText( "" );
-  }
-  else
+  if ( resultsTab -> count() > 0 )
   {
     updateVisibleWebView( debug_cast<SC_WebView*>( resultsTab -> widget( index ) ) );
-    cmdLine -> setText( resultsFileText );
   }
+  cmdLine -> setText( resultsFileText );
 }
 
 void SC_MainWindow::resultsTabCloseRequest( int index )
 {
-  if ( index <= 0 )
-  {
-    // Ignore attempts to close Legend
-  }
-  else
-  {
-    resultsTab -> removeTab( index );
-  }
+  resultsTab -> removeTab( index );
 }
 
 void SC_MainWindow::simulateTabCloseRequest( int index )

diff --git a/simcqt.pro b/simcqt.pro
@@ -184,7 +184,6 @@ unix:!mac {
   data.path = $$INSTALLPATH
   data.files += Welcome.html
   data.files += Welcome.png
-  data.files += Legend.html
   data.files += READ_ME_FIRST.txt
   data.commands = @echo Installing global files to $$INSTALLPATH
 

diff --git a/util_scripts/package.bat b/util_scripts/package.bat
@@ -40,7 +40,6 @@ xcopy /E /I /H %target_dir%\source\locale %target_dir%\locale
 rd /Q /S %target_dir%\source\locale\
 
 move %target_dir%\source\Examples.simc %target_dir%\
-move %target_dir%\source\Legend.html %target_dir%\
 move %target_dir%\source\READ_ME_FIRST.txt %target_dir%\
 move %target_dir%\source\Welcome.html %target_dir%\
 move %target_dir%\source\Welcome.png %target_dir%\

diff --git a/util_scripts/package_qt5_mingw.bat b/util_scripts/package_qt5_mingw.bat
@@ -40,7 +40,6 @@ xcopy /E /I /H %target_dir%\source\profiles %target_dir%\profiles
 rd /Q /S %target_dir%\source\profiles\
 
 move %target_dir%\source\Examples.simc %target_dir%\
-move %target_dir%\source\Legend.html %target_dir%\
 move %target_dir%\source\READ_ME_FIRST.txt %target_dir%\
 move %target_dir%\source\Welcome.html %target_dir%\
 move %target_dir%\source\Welcome.png %target_dir%\

diff --git a/util_scripts/package_qt5_mingw_trunk.bat b/util_scripts/package_qt5_mingw_trunk.bat
@@ -39,7 +39,6 @@ xcopy /E /I /H %target_dir%\source\profiles %target_dir%\profiles
 rd /Q /S %target_dir%\source\profiles\
 
 move %target_dir%\source\Examples.simc %target_dir%\
-move %target_dir%\source\Legend.html %target_dir%\
 move %target_dir%\source\READ_ME_FIRST.txt %target_dir%\
 move %target_dir%\source\Welcome.html %target_dir%\
 move %target_dir%\source\Welcome.png %target_dir%\

diff --git a/windows_installer/SimulationCraft.wxs b/windows_installer/SimulationCraft.wxs
@@ -20,7 +20,6 @@
 		  <Shortcut Id="SimulationCraftICON" Directory="ProgramMenuDir" Name="SimulationCraft $(var.prod_ver)" WorkingDirectory='INSTALLDIR' Icon="SimulationCraft.ico" IconIndex="0" Advertise="yes" />
 		</File>
 		<File Id='Examples.simc' Name='Examples.simc' DiskId='1' Source='Examples.simc' />
-		<File Id='Legend.html' Name='Legend.html' DiskId='1' Source='Legend.html' />
 		<File Id='READ_ME_FIRST.txt' Name='READ_ME_FIRST.txt' DiskId='1' Source='READ_ME_FIRST.txt' />
 		<File Id='Welcome.html' Name='Welcome.html' DiskId='1' Source='Welcome.html' />
 		<File Id='Welcome.png' Name='Welcome.png' DiskId='1' Source='Welcome.png' />