[rkward-cvs] SF.net SVN: rkward:[4266] trunk/rkward/rkward/plugin

[tfry at users.sourceforge.net]

Revision: 4266
          http://rkward.svn.sourceforge.net/rkward/?rev=4266&view=rev
Author:   tfry
Date:     2012-05-28 16:07:00 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Remove RKComponent::isReady(). Not needed, since this is implied by RKComponent:isSatisfied().

Modified Paths:
--------------
    trunk/rkward/rkward/plugin/rkcomponent.h
    trunk/rkward/rkward/plugin/rkpreviewbox.cpp
    trunk/rkward/rkward/plugin/rkstandardcomponent.cpp
    trunk/rkward/rkward/plugin/rkstandardcomponent.h

Modified: trunk/rkward/rkward/plugin/rkcomponent.h
===================================================================
--- trunk/rkward/rkward/plugin/rkcomponent.h	2012-05-28 16:05:41 UTC (rev 4265)
+++ trunk/rkward/rkward/plugin/rkcomponent.h	2012-05-28 16:07:00 UTC (rev 4266)
@@ -179,14 +179,11 @@
 /** convenience call to set requiredness property (and hence requiredness of this component) */
 	void setRequired (bool required);
 
-/** The parent of this component. Should be notified, whenever isSatisfied () or isReady ()-state changed. */
+/** The parent of this component. Should be notified, whenever isSatisfied () or recursiveStatus () changed. */
 	RKComponent *parentComponent () const { return _parent; };
 /** The standard component containing this component (if any). If @param id_adjust is given, it will be set to a relative path to the standard component. */
 	RKStandardComponent *standardComponent (QString *id_adjust=0);
 
-/** Is the component "ready"? I.e. it is up to date according to current settings. Does not imply it is also satisfied. Default implementation always returns true. */
-	virtual bool isReady () { return true; };
-
 /** Find the id of this component. NOTE: this is slow. Better to store the id in the first place, if needed */
 	QString getIdInParent () const;
 protected slots:

Modified: trunk/rkward/rkward/plugin/rkpreviewbox.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkpreviewbox.cpp	2012-05-28 16:05:41 UTC (rev 4265)
+++ trunk/rkward/rkward/plugin/rkpreviewbox.cpp	2012-05-28 16:07:00 UTC (rev 4266)
@@ -2,7 +2,7 @@
                           rkpreviewbox  -  description
                              -------------------
     begin                : Wed Jan 24 2007
-    copyright            : (C) 2007, 2009 by Thomas Friedrichsmeier
+    copyright            : (C) 2007, 2009, 2012 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -120,10 +120,6 @@
 	if (!parentComponent ()->isSatisfied ()) {
 		return;
 	}
-	if (!parentComponent ()->isReady ()) {
-		tryPreview ();
-		return;
-	}
 
 	if (!last_plot_done) {		// if the last plot is not done, yet, wait before starting the next.
 		new_plot_pending = true;
@@ -169,7 +165,7 @@
 	if (!toggle_preview_box->isChecked ()) {
 		status_label->setText (i18n ("Preview disabled"));
 	} else {
-		if (parentComponent ()->isSatisfied () && parentComponent ()->isReady ()) {
+		if (parentComponent ()->isSatisfied ()) {
 			if (last_plot_done && (!new_plot_pending)) {
 				status_label->setText (i18n ("Preview up to date"));
 			} else {

Modified: trunk/rkward/rkward/plugin/rkstandardcomponent.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkstandardcomponent.cpp	2012-05-28 16:05:41 UTC (rev 4265)
+++ trunk/rkward/rkward/plugin/rkstandardcomponent.cpp	2012-05-28 16:07:00 UTC (rev 4266)
@@ -406,13 +406,6 @@
 	RKComponent::changed ();
 }
 
-bool RKStandardComponent::isReady () {
-	RK_TRACE (PLUGIN);
-	RK_ASSERT (backend);
-
-	return (!(backend->isBusy ()));
-}
-
 void RKStandardComponent::backendIdle () {
 	RK_TRACE (PLUGIN);
 

Modified: trunk/rkward/rkward/plugin/rkstandardcomponent.h
===================================================================
--- trunk/rkward/rkward/plugin/rkstandardcomponent.h	2012-05-28 16:05:41 UTC (rev 4265)
+++ trunk/rkward/rkward/plugin/rkstandardcomponent.h	2012-05-28 16:07:00 UTC (rev 4266)
@@ -46,8 +46,6 @@
 	~RKStandardComponent ();
 /** reimplemented to update code on changes*/
 	void changed ();
-/** reimplemented to return true only when the backend is idle */
-	bool isReady ();
 /** reimplemented to return true, if the RKStandardComponent is in Wizard mode */
 	bool isWizardish ();
 /** reimplemented to actually answer the question (if in Wizard mode) */

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