[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 976
Date       : Mon May  8 17:14:44 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camview.cpp
   M /Trunk/XaraLX/wxOil/xpoilflt.cpp

Put back fix for document close and stubbed out plugin filter HowCompatible function


Diff:
Index: Trunk/XaraLX/wxOil/xpoilflt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/xpoilflt.cpp	(revision 975)
+++ Trunk/XaraLX/wxOil/xpoilflt.cpp	(revision 976)
@@ -878,6 +878,10 @@
 	// Check stderr for errors
 	// Get HowCompatible from stdout
 
+// Temporarily remove this as it is interferring with file loading
+// Looks like the loading code is using the first filter that doesn't return 0
+// rather than using the filter that returns the best score
+#if FALSE
 	wxString sCommand;
 	// Does this need double quotes to cope with spaces in filenames?
 	sCommand.Printf(_T("%s -c -f %s"), (LPCTSTR)m_FilterPath.GetPath(), (LPCTSTR)FileName.GetPath());
@@ -891,14 +895,12 @@
 		if (saOutput.Count() > 0)
 		{
 			INT32 Val = wxAtoi(saOutput[0]);
+			TRACE(_T("Command '%s' returned string '%s'"), sCommand.c_str(), saOutput[0].c_str());
+			TRACE(_T("Value = %d"), Val);
 			if (Val >= 0 && Val <= 10)
 			{
 				HowCompatible = Val;
 			}
-			else
-			{
-				TRACE(_T("Command '%s' returned value of %d"), sCommand.c_str(), Val);
-			}
 		}
 		else
 		{
@@ -909,7 +911,7 @@
 	{
 		TRACE(_T("Command '%s' exited with code %d"), sCommand.c_str(), code);
 	}
-
+#endif
 	return(HowCompatible);
 }
 
Index: Trunk/XaraLX/wxOil/camview.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camview.cpp	(revision 975)
+++ Trunk/XaraLX/wxOil/camview.cpp	(revision 976)
@@ -1498,7 +1498,7 @@
 	else
 	{
 		TRACEUSER("Gerry", _T("Deactivating the view
"));
-/*
+
 		// Lets just try setting no selected for the time being but only if this view is the selected one
 		if (DocView::GetSelected() == pDocView)
 		{
@@ -1508,7 +1508,7 @@
 		else
 		{
 			TRACEUSER("Gerry", _T("Not the selected view
"));
-		}*/
+		}
 	}
 }
 


Xara