Import molequeue client

CMakeLists.txt

@@ -58,7 +58,6 @@ option(USE_LIBMSYM "Enable optional features using libmsym" ON)
 option(USE_SPGLIB "Enable optional features using spglib" ON)
 option(USE_MMTF "Enable optional features using mmtf" ON)
 option(USE_PROTOCALL "Enable libraries that use ProtoCall" OFF)
-option(USE_MOLEQUEUE "Enable the MoleQueue dependent functionality" ON)
 option(USE_PYTHON "Use Python to wrap some of our API" OFF)
 
 add_subdirectory(utilities)

avogadro/CMakeLists.txt

@@ -60,10 +60,9 @@ if(USE_QT)
     add_subdirectory(qtopengl)
     include_directories(${CMAKE_CURRENT_BINARY_DIR}/qtopengl)
   endif()
-  if(USE_MOLEQUEUE)
-    add_subdirectory(molequeue)
-    include_directories(${CMAKE_CURRENT_BINARY_DIR}/molequeue)
-  endif()
+  # Add unconditionally as this talks to MoleQueue, but doesn't depend on it.
+  add_subdirectory(molequeue)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR}/molequeue)
   if(USE_VTK)
     add_subdirectory(vtk)
     include_directories(${CMAKE_CURRENT_BINARY_DIR}/vtk)

avogadro/molequeue/CMakeLists.txt

@@ -1,7 +1,3 @@
-# Pull in MoleQueue
-find_package(MoleQueue REQUIRED NO_MODULE)
-include_directories(${MoleQueue_INCLUDE_DIRS})
-
 find_package(Eigen3 REQUIRED)
 # Add as "system headers" to avoid warnings generated by them with
 # compilers that support that notion.
@@ -29,6 +25,9 @@ set(SOURCES
   molequeuemanager.cpp
   molequeuequeuelistmodel.cpp
   molequeuewidget.cpp
+  client/client.cpp
+  client/jobobject.cpp
+  client/jsonrpcclient.cpp
 )
 
 set(UIS
@@ -42,4 +41,4 @@ list(APPEND SOURCES ${UI_SOURCES})
 
 avogadro_add_library(AvogadroMoleQueue ${HEADERS} ${SOURCES})
 set_target_properties(AvogadroMoleQueue PROPERTIES AUTOMOC TRUE)
-target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient Qt5::Widgets Qt5::Network)
+target_link_libraries(AvogadroMoleQueue AvogadroQtGui Qt5::Widgets Qt5::Network)

avogadro/molequeue/batchjob.cpp

@@ -1,17 +1,6 @@
 /******************************************************************************
-
   This source file is part of the Avogadro project.
-
-  Copyright 2013 Kitware, Inc.
-
-  This source code is released under the New BSD License, (the "License").
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
+  This source code is released under the 3-Clause BSD License, (see "LICENSE").
 ******************************************************************************/
 
 #include "batchjob.h"
@@ -21,8 +10,6 @@
 
 #include <limits>
 
-using MoleQueue::JobObject;
-
 namespace Avogadro {
 namespace MoleQueue {
 
@@ -78,7 +65,7 @@ BatchJob::BatchId BatchJob::submitNextJob(const Core::Molecule& mol)
   BatchId bId = m_jobObjects.size();
 
   // Create the job object:
-  ::MoleQueue::JobObject job;
+  JobObject job;
   job.fromJson(m_moleQueueOptions);
   job.setDescription(
     tr("Batch Job #%L1 (%2)").arg(bId + 1).arg(job.description()));
@@ -119,7 +106,7 @@ bool BatchJob::lookupJob(BatchId bId)
   if (!mqManager.connectIfNeeded())
     return false;
 
-  ::MoleQueue::Client& client = mqManager.client();
+  Client& client = mqManager.client();
   RequestId rId = client.lookupJob(sId);
   m_requests.insert(rId, Request(Request::LookupJob, bId));
   return true;
@@ -223,7 +210,7 @@ void BatchJob::setup()
   }
 
   MoleQueueManager& mqManager = MoleQueueManager::instance();
-  ::MoleQueue::Client& client = mqManager.client();
+  Client& client = mqManager.client();
   connect(&client, SIGNAL(submitJobResponse(int, uint)),
           SLOT(handleSubmissionReply(int, uint)));
   connect(&client, SIGNAL(lookupJobResponse(int, QJsonObject)),

avogadro/molequeue/batchjob.h

@@ -1,17 +1,6 @@
 /******************************************************************************
-
   This source file is part of the Avogadro project.
-
-  Copyright 2013 Kitware, Inc.
-
-  This source code is released under the New BSD License, (the "License").
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
+  This source code is released under the 3-Clause BSD License, (see "LICENSE").
 ******************************************************************************/
 
 #ifndef AVOGADRO_QTGUI_BATCHJOB_H
@@ -23,7 +12,7 @@
 
 #include <avogadro/core/avogadrocore.h>
 
-#include <molequeue/client/jobobject.h>
+#include "client/jobobject.h"
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QMap>
@@ -107,7 +96,7 @@ class AVOGADROMOLEQUEUE_EXPORT BatchJob : public QObject
    */
   void setMoleQueueOptions(const QJsonObject& opts);
   QJsonObject moleQueueOptions() const;
-  ::MoleQueue::JobObject moleQueueJobTemplate() const;
+  JobObject moleQueueJobTemplate() const;
   /**@}*/
 
   /**
@@ -138,7 +127,7 @@ class AVOGADROMOLEQUEUE_EXPORT BatchJob : public QObject
    * @return The most recent JobObject for the job with the batch id @a batchId.
    * These are updated for each change in job state.
    */
-  ::MoleQueue::JobObject jobObject(BatchId batchId) const;
+  JobObject jobObject(BatchId batchId) const;
 
   /**
    * @return True if @a state corresponds to a job that is finished running.
@@ -237,7 +226,7 @@ private slots:
   QJsonObject m_moleQueueOptions;
 
   /// Cached job states.
-  QList<::MoleQueue::JobObject> m_jobObjects;
+  QList<JobObject> m_jobObjects;
   /// Lookup batch ids from server ids.
   QMap<ServerId, BatchId> m_serverIds;
   /// Job states. For fast lookups without string conversions.
@@ -270,9 +259,9 @@ inline QJsonObject BatchJob::moleQueueOptions() const
   return m_moleQueueOptions;
 }
 
-inline ::MoleQueue::JobObject BatchJob::moleQueueJobTemplate() const
+inline JobObject BatchJob::moleQueueJobTemplate() const
 {
-  ::MoleQueue::JobObject result;
+  JobObject result;
   result.fromJson(m_moleQueueOptions);
   return result;
 }
@@ -306,9 +295,9 @@ inline BatchJob::ServerId BatchJob::serverId(BatchJob::BatchId id) const
            : InvalidServerId;
 }
 
-inline ::MoleQueue::JobObject BatchJob::jobObject(BatchJob::BatchId id) const
+inline JobObject BatchJob::jobObject(BatchJob::BatchId id) const
 {
-  return id < m_jobObjects.size() ? m_jobObjects[id] : ::MoleQueue::JobObject();
+  return id < m_jobObjects.size() ? m_jobObjects[id] : JobObject();
 }
 
 inline bool BatchJob::isTerminal(BatchJob::JobState state)